summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2006-04-21 11:04:30 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2006-04-21 11:04:30 +0000
commit3005e21cc624ee9a4cec635a6eb518488e285d28 (patch)
tree0f051200ac802a06344ea0ec81c0ec2a4c03eb8b /packages/linux
parent28f02967abbf61c832bd5713ee7c055e2c73eb19 (diff)
linux-openzaurus: added some PCMCIA ids from Pavel Roskin (this will go into 2.6.17) and other places
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch (renamed from packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r1.patch)14
-rw-r--r--packages/linux/linux-openzaurus_2.6.16.bb5
2 files changed, 5 insertions, 14 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r1.patch b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch
index c14482babb..c7be5b3373 100644
--- a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r1.patch
+++ b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch
@@ -31,15 +31,5 @@ This patch made them bound into hostap like it was before.
Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
---- linux/drivers/net/wireless/hostap/hostap_cs.c.orig 2006-04-09 12:42:34.944903728 +0200
-+++ linux/drivers/net/wireless/hostap/hostap_cs.c 2006-04-09 12:42:37.474519168 +0200
-@@ -912,6 +912,9 @@
- PCMCIA_DEVICE_PROD_ID123(
- "SMC", "SMC2632W", "Version 01.02",
- 0xc4f8b18b, 0x474a1f2a, 0x4b74baa0),
-+ PCMCIA_DEVICE_PROD_ID123(
-+ "Pretec", "CompactWLAN Card 802.11b", "2.5",
-+ 0x1cadd3e5, 0xe697636c, 0x7a5bfcf1),
- PCMCIA_DEVICE_PROD_ID12("BUFFALO", "WLI-CF-S11G",
- 0x2decece3, 0x82067c18),
- PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card",
+// will add some here
+
diff --git a/packages/linux/linux-openzaurus_2.6.16.bb b/packages/linux/linux-openzaurus_2.6.16.bb
index 87450bab3a..932775c038 100644
--- a/packages/linux/linux-openzaurus_2.6.16.bb
+++ b/packages/linux/linux-openzaurus_2.6.16.bb
@@ -1,6 +1,6 @@
include linux-openzaurus.inc
-PR = "r7"
+PR = "r8"
# Handy URLs
# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
@@ -83,7 +83,8 @@ SRC_URI = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.16.tar.bz2 \
${RPSRC}/pxa-linking-bug.patch;patch=1 \
file://serial-add-support-for-non-standard-xtals-to-16c950-driver.patch;patch=1 \
file://connectplus-remove-ide-HACK.patch;patch=1 \
- file://hrw-pcmcia-ids-r1.patch;patch=1 \
+ file://24-hostap_cs_id.diff;patch=1 \
+ file://hrw-pcmcia-ids-r2.patch;patch=1 \
file://defconfig-c7x0 \
file://defconfig-ipaq-pxa270 \
file://defconfig-collie \