From: Koen Kooi <koen@openembedded.org>
Date: Fri, 26 Aug 2005 21:10:09 +0000 (+0000)
Subject: pcmcia-cs: patch arm/pcmcia to handle 2.6 modules
X-Git-Tag: Release-2010-05/1~9453^2~3775^2~7^2~4
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7c7a335e89702e1c98c63653fff399a098a1882;p=openembedded.git

pcmcia-cs: patch arm/pcmcia to handle 2.6 modules
Patch courtesy Matt Reimer, closes #260
---

diff --git a/packages/pcmcia-cs/files/arm/pcmcia b/packages/pcmcia-cs/files/arm/pcmcia
index 3dc330db21..d42bc84e77 100644
--- a/packages/pcmcia-cs/files/arm/pcmcia
+++ b/packages/pcmcia-cs/files/arm/pcmcia
@@ -1,6 +1,14 @@
 case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </proc/cpuinfo` in
   *XScale-PXA2*)
-    PCIC=pxa_cs
+
+    case "`uname -r`" in
+        2.4*)
+		PCIC=pxa_cs
+		;;
+	2.6*)
+		PCIC=pxa2xx_core
+		;;
+    esac
     ;;
   *StrongARM-1100* | *StrongARM-1110*)
     PCIC=sa1100_cs
@@ -12,6 +20,11 @@ case `awk 'BEGIN { FS=":" } /Processor/ { gsub(/ /, "", $2) ; print $2 } ' </pro
 esac
 
 if grep -q iPAQ /proc/cpuinfo; then
-  PCIC_EXTRA=h3600_generic_sleeve
+  case `module_id` in
+    "HP iPAQ H2200")
+	;;
+    *)
+	PCIC_EXTRA=h3600_generic_sleeve
+	;;
+  esac
 fi
-