Apply more chanegs from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@272 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 10 insertions, 3 deletions

diff --git a/openembedded/packages/pcmcia-cs/files/arm/pcmcia b/openembedded/packages/pcmcia-cs/files/arm/pcmcia
index 05b381a5f9..d5346fb13a 100644
--- a/openembedded/packages/pcmcia-cs/files/arm/pcmcia
+++ b/openembedded/packages/pcmcia-cs/files/arm/pcmcia
@@ -9,11 +9,9 @@ case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </pro
     case "`uname -r`" in
         2.4*)
                 PCIC=pxa_cs
-                DS=ds
                 ;;
         2.6*)
                 PCIC=pxa2xx_core
-                DS=pcmcia
                 ;;
     esac
     ;;
@@ -26,6 +24,15 @@ case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </pro
     ;;
 esac
 
+case "`uname -r`" in
+    2.4*)
+            DS=ds
+            ;;
+    2.6*)
+            DS=pcmcia
+            ;;
+esac
+
 case `module_id` in
   "HP iPAQ H3"* | "HP iPAQ H5"*)
     PCIC_EXTRA=h3600_generic_sleeve
diff --git a/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index e0ebf70d93..1db3006e14 100644
--- a/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
-PR = "r23"
+PR = "r27"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
            file://busybox.patch;patch=1 \