From 3a96c32d8fa1932baa06aa7bb803bf41d5b76b5e Mon Sep 17 00:00:00 2001 From: Rod Whitby Date: Fri, 11 Jan 2008 02:30:48 +0000 Subject: [PATCH] nas100d-pata-artop patch is no longer required due to upstream fixes SVN-Revision: 10163 --- .../015-nas100d_pata_artop_single_port.patch | 23 ------------------- 1 file changed, 23 deletions(-) delete mode 100644 target/linux/ixp4xx/patches-2.6.23/015-nas100d_pata_artop_single_port.patch 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 deleted file mode 100644 index e6b717147c8..00000000000 --- a/target/linux/ixp4xx/patches-2.6.23/015-nas100d_pata_artop_single_port.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 - #include - #include -+#include - - #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); -- 2.30.2