From 3005e21cc624ee9a4cec635a6eb518488e285d28 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 21 Apr 2006 11:04:30 +0000 Subject: linux-openzaurus: added some PCMCIA ids from Pavel Roskin (this will go into 2.6.17) and other places --- .../hrw-pcmcia-ids-r1.patch | 45 ---------------------- .../hrw-pcmcia-ids-r2.patch | 35 +++++++++++++++++ packages/linux/linux-openzaurus_2.6.16.bb | 5 ++- 3 files changed, 38 insertions(+), 47 deletions(-) delete mode 100644 packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r1.patch create mode 100644 packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch (limited to 'packages/linux') 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-r1.patch deleted file mode 100644 index c14482babb..0000000000 --- a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r1.patch +++ /dev/null @@ -1,45 +0,0 @@ - -The ident for Seagate 8GB microdrive is -"SEAGATE", "ST1" -hash 0x76dc4190, 0xcfba9599 -manfid 0x0111, 0x0000 - -Signed-off-by: Marcin Juszkiewicz - - drivers/ide/legacy/ide-cs.c | 1 + - 1 file changed, 1 insertion(+) - -Index: linux-2.6.16/drivers/ide/legacy/ide-cs.c -=================================================================== ---- linux-2.6.16.orig/drivers/ide/legacy/ide-cs.c 2006-04-20 12:41:41.000000000 +0200 -+++ linux-2.6.16/drivers/ide/legacy/ide-cs.c 2006-04-20 12:45:19.640621552 +0200 -@@ -444,6 +444,7 @@ - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), - PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), - PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), -+ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x76dc4190, 0xcfba9599), /* Seagate 8GB microdrive */ - PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), - PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), - PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), - - -------------------------------------------------------------------------- -With pcmcia-cs -> pcmciautils change some cards which was working with -hostap driver now are bound into orinoco driver. - -This patch made them bound into hostap like it was before. - -Signed-off-by: Marcin Juszkiewicz - ---- 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", diff --git a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch new file mode 100644 index 0000000000..c7be5b3373 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch @@ -0,0 +1,35 @@ + +The ident for Seagate 8GB microdrive is +"SEAGATE", "ST1" +hash 0x76dc4190, 0xcfba9599 +manfid 0x0111, 0x0000 + +Signed-off-by: Marcin Juszkiewicz + + drivers/ide/legacy/ide-cs.c | 1 + + 1 file changed, 1 insertion(+) + +Index: linux-2.6.16/drivers/ide/legacy/ide-cs.c +=================================================================== +--- linux-2.6.16.orig/drivers/ide/legacy/ide-cs.c 2006-04-20 12:41:41.000000000 +0200 ++++ linux-2.6.16/drivers/ide/legacy/ide-cs.c 2006-04-20 12:45:19.640621552 +0200 +@@ -444,6 +444,7 @@ + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "CD-ROM", 0x281f1c5d, 0x66536591), + PCMCIA_DEVICE_PROD_ID12("PCMCIA", "PnPIDE", 0x281f1c5d, 0x0c694728), + PCMCIA_DEVICE_PROD_ID12("SHUTTLE TECHNOLOGY LTD.", "PCCARD-IDE/ATAPI Adapter", 0x4a3f0ba0, 0x322560e1), ++ PCMCIA_DEVICE_PROD_ID12("SEAGATE", "ST1", 0x76dc4190, 0xcfba9599), /* Seagate 8GB microdrive */ + PCMCIA_DEVICE_PROD_ID12("TOSHIBA", "MK2001MPL", 0xb4585a1a, 0x3489e003), + PCMCIA_DEVICE_PROD_ID1("TRANSCEND 512M ", 0xd0909443), + PCMCIA_DEVICE_PROD_ID12("WIT", "IDE16", 0x244e5994, 0x3e232852), + + +------------------------------------------------------------------------- +With pcmcia-cs -> pcmciautils change some cards which was working with +hostap driver now are bound into orinoco driver. + +This patch made them bound into hostap like it was before. + +Signed-off-by: Marcin Juszkiewicz + +// 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 \ -- cgit v1.2.3