From ef6e25a8dc5b634ce6b4a59b56469c4eb0aff9d9 Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@crashcourse.ca>
Date: Tue, 3 Jul 2012 05:09:12 -0400
Subject: pcmcia-cs: Remove references to long-deprecated pcmcia-cs.

pcmciautils is the appropriate PCMCIA package these days.

(From OE-Core rev: 5066f7e9750253bc4678f2884e15f0333e60932b)

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-bsp/pcmciautils/pcmciautils.inc | 1 -
 1 file changed, 1 deletion(-)

(limited to 'meta/recipes-bsp')

diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils.inc b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
index c0c1d0cea4..fa35daf46d 100644
--- a/meta/recipes-bsp/pcmciautils/pcmciautils.inc
+++ b/meta/recipes-bsp/pcmciautils/pcmciautils.inc
@@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 DEPENDS = "sysfsutils flex-native"
 RDEPENDS_${PN} = "udev module-init-tools"
-RCONFLICTS_${PN} += "pcmcia-cs"
 
 SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2"
 
-- 
cgit v1.2.3-54-g00ecf