mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-09-18 21:23:41 +03:00
58f98ac382
* 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
24 lines
806 B
Diff
24 lines
806 B
Diff
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);
|