diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2007-12-28 21:00:01 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2007-12-28 21:00:01 +0000 |
commit | 2b6021130e4713dad0709586d9f74f464676012f (patch) | |
tree | 35b9cc8a3d433d2c1bb70fe82b947f404becf8c2 /target/linux/ixp4xx/patches-2.6.23/015-nas100d_pata_artop_single_port.patch | |
parent | a63bc28b035f47f618511a93c36cb581f749e618 (diff) | |
download | master-187ad058-2b6021130e4713dad0709586d9f74f464676012f.tar.gz master-187ad058-2b6021130e4713dad0709586d9f74f464676012f.tar.bz2 master-187ad058-2b6021130e4713dad0709586d9f74f464676012f.zip |
* upgrade ixp4xx to 2.6.23.12
* upgrade to the new ethernet driver (temporary breaks Marvell switch support on Compex units)
* handle NPE microcodes in a user friendly way - YAY for Intel for changing the license
* add support for the Lanready AP1000 (used in for example the Ligowave LGO2AGN)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10016 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.23/015-nas100d_pata_artop_single_port.patch')
-rw-r--r-- | target/linux/ixp4xx/patches-2.6.23/015-nas100d_pata_artop_single_port.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.23/015-nas100d_pata_artop_single_port.patch b/target/linux/ixp4xx/patches-2.6.23/015-nas100d_pata_artop_single_port.patch new file mode 100644 index 0000000000..e6b717147c --- /dev/null +++ b/target/linux/ixp4xx/patches-2.6.23/015-nas100d_pata_artop_single_port.patch @@ -0,0 +1,23 @@ +diff -uprN linux-2.6.23.orig/drivers/ata/pata_artop.c linux-2.6.23/drivers/ata/pata_artop.c +--- linux-2.6.23.orig/drivers/ata/pata_artop.c 2007-10-09 15:31:38.000000000 -0500 ++++ linux-2.6.23/drivers/ata/pata_artop.c 2007-10-11 00:59:14.000000000 -0500 +@@ -27,6 +27,7 @@ + #include <scsi/scsi_host.h> + #include <linux/libata.h> + #include <linux/ata.h> ++#include <asm/mach-types.h> + + #define DRV_NAME "pata_artop" + #define DRV_VERSION "0.4.4" +@@ -489,6 +490,11 @@ static int artop_init_one (struct pci_de + pci_read_config_byte(pdev, 0x4a, ®); + pci_write_config_byte(pdev, 0x4a, (reg & ~0x01) | 0x80); + ++ /* NAS100D workaround - probing second port kills uhci_hcd */ ++#ifdef CONFIG_MACH_NAS100D ++ if (machine_is_nas100d()) ++ ppi[1] = &ata_dummy_port_info; ++#endif + } + + BUG_ON(ppi[0] == NULL); |