summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2008-03-21 15:43:34 +0000
committerKoen Kooi <koen@openembedded.org>2008-03-21 15:43:34 +0000
commitd1e1b0fa8a08cb717206a3a2fbc0fa0b2f4f68fd (patch)
tree3e92e7d4e94b89874b58f41a21fbab6b41baf403 /packages/linux
parent3be6440ea603e11e2f69afbf28fa38a0446ad189 (diff)
linux 2.6.24: apply connectplus hack for simpad, closes #4094
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux/simpad/connectplus-remove-ide-HACK.patch12
-rw-r--r--packages/linux/linux_2.6.24.bb5
2 files changed, 15 insertions, 2 deletions
diff --git a/packages/linux/linux/simpad/connectplus-remove-ide-HACK.patch b/packages/linux/linux/simpad/connectplus-remove-ide-HACK.patch
new file mode 100644
index 0000000000..4414b21191
--- /dev/null
+++ b/packages/linux/linux/simpad/connectplus-remove-ide-HACK.patch
@@ -0,0 +1,12 @@
+Index: linux-2.6.13/drivers/ide/legacy/ide-cs.c
+===================================================================
+--- linux-2.6.13.orig/drivers/ide/legacy/ide-cs.c 2005-09-01 22:43:46.000000000 +0100
++++ linux-2.6.13/drivers/ide/legacy/ide-cs.c 2005-09-01 22:45:46.000000000 +0100
+@@ -488,7 +488,6 @@
+ PCMCIA_DEVICE_PROD_ID123("KODAK Picture Card ", "KODAK ", "V100K", 0x94a0d8f3, 0xe4fc3ea0, 0xe5e7eed4),
+ PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
+ PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
+- PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
+ PCMCIA_DEVICE_NULL,
+ };
+ MODULE_DEVICE_TABLE(pcmcia, ide_ids);
diff --git a/packages/linux/linux_2.6.24.bb b/packages/linux/linux_2.6.24.bb
index 7fc1aa38ca..d0a2ad7826 100644
--- a/packages/linux/linux_2.6.24.bb
+++ b/packages/linux/linux_2.6.24.bb
@@ -11,7 +11,7 @@ DEFAULT_PREFERENCE_at32stk1000 = "1"
DEPENDS_append_mpc8313e-rdb = " dtc-native"
-PR = "r9"
+PR = "r10"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
@@ -34,7 +34,8 @@ SRC_URI_append_simpad = "\
file://linux-2.6.24-SIMpad-hostap_cs-shared-irq.patch;patch=1 \
file://linux-2.6.24-SIMpad-orinoco_cs-shared-irq.patch;patch=1 \
file://linux-2.6.24-SIMpad-rtc-sa1100.patch;patch=1 \
- file://collie-kexec.patch;patch=1 \
+ file://connectplus-remove-ide-HACK.patch;patch=1 \
+ file://collie-kexec.patch;patch=1 \
file://export_atags-r2.patch;patch=1 \
"