summaryrefslogtreecommitdiff
path: root/packages/linux
diff options
context:
space:
mode:
Diffstat (limited to 'packages/linux')
-rw-r--r--packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r3.patch (renamed from packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch)21
-rw-r--r--packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r3.patch (renamed from packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r2.patch)21
-rw-r--r--packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch (renamed from packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r2.patch)21
-rw-r--r--packages/linux/linux-openzaurus_2.6.16.bb2
-rw-r--r--packages/linux/linux-openzaurus_2.6.17+git.bb2
-rw-r--r--packages/linux/linux-openzaurus_2.6.17.bb2
6 files changed, 18 insertions, 51 deletions
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-r3.patch
index 6f77d51dee..b27fd09068 100644
--- a/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r2.patch
+++ b/packages/linux/linux-openzaurus-2.6.16/hrw-pcmcia-ids-r3.patch
@@ -15,28 +15,17 @@ Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
drivers/ide/legacy/ide-cs.c | 1 +
1 file changed, 1 insertion(+)
-Index: linux-2.6.16/drivers/ide/legacy/ide-cs.c
+Index: linux-2.6.17/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,8 @@
+--- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c 2006-06-18 03:49:35.000000000 +0200
++++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-10 23:29:28.696446000 +0200
+@@ -402,6 +402,9 @@
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", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */
+ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d),
++ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
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 <openembedded@hrw.one.pl>
-
-// will add some here
-
diff --git a/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r2.patch b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r3.patch
index 6f77d51dee..b27fd09068 100644
--- a/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r2.patch
+++ b/packages/linux/linux-openzaurus-2.6.17+git/hrw-pcmcia-ids-r3.patch
@@ -15,28 +15,17 @@ Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
drivers/ide/legacy/ide-cs.c | 1 +
1 file changed, 1 insertion(+)
-Index: linux-2.6.16/drivers/ide/legacy/ide-cs.c
+Index: linux-2.6.17/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,8 @@
+--- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c 2006-06-18 03:49:35.000000000 +0200
++++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-10 23:29:28.696446000 +0200
+@@ -402,6 +402,9 @@
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", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */
+ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d),
++ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
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 <openembedded@hrw.one.pl>
-
-// will add some here
-
diff --git a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r2.patch b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch
index 6f77d51dee..b27fd09068 100644
--- a/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r2.patch
+++ b/packages/linux/linux-openzaurus-2.6.17/hrw-pcmcia-ids-r3.patch
@@ -15,28 +15,17 @@ Signed-off-by: Marcin Juszkiewicz <openembedded@hrw.one.pl>
drivers/ide/legacy/ide-cs.c | 1 +
1 file changed, 1 insertion(+)
-Index: linux-2.6.16/drivers/ide/legacy/ide-cs.c
+Index: linux-2.6.17/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,8 @@
+--- linux-2.6.17.orig/drivers/ide/legacy/ide-cs.c 2006-06-18 03:49:35.000000000 +0200
++++ linux-2.6.17/drivers/ide/legacy/ide-cs.c 2006-07-10 23:29:28.696446000 +0200
+@@ -402,6 +402,9 @@
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", 0x87c1b330, 0xe1f30883), /* Seagate 8GB microdrive */
+ PCMCIA_DEVICE_PROD_ID12("SAMSUNG", "04/05/06", 0x43d74cb4, 0x6a22777d),
++ PCMCIA_DEVICE_PROD_ID12("SMI VENDOR", "SMI PRODUCT", 0x30896c92, 0x703cc5f6),
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 <openembedded@hrw.one.pl>
-
-// 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 03801b3d7c..85f027f267 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 = "r40"
+PR = "r41"
# Handy URLs
# git://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git \
diff --git a/packages/linux/linux-openzaurus_2.6.17+git.bb b/packages/linux/linux-openzaurus_2.6.17+git.bb
index b33625932f..330356dccf 100644
--- a/packages/linux/linux-openzaurus_2.6.17+git.bb
+++ b/packages/linux/linux-openzaurus_2.6.17+git.bb
@@ -1,6 +1,6 @@
include linux-openzaurus.inc
-PR = "r3"
+PR = "r4"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/linux/linux-openzaurus_2.6.17.bb b/packages/linux/linux-openzaurus_2.6.17.bb
index eb41fc2a8c..c7f078faff 100644
--- a/packages/linux/linux-openzaurus_2.6.17.bb
+++ b/packages/linux/linux-openzaurus_2.6.17.bb
@@ -1,6 +1,6 @@
include linux-openzaurus.inc
-PR = "r7"
+PR = "r8"
DEFAULT_PREFERENCE = "-1"