aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-02-06 22:19:10 -0500
committerJeff Garzik <jeff@garzik.org>2007-02-09 17:39:40 -0500
commit66efc5a7e3061c3597ac43a8bb1026488d57e66b (patch)
treec7507a6d7a36f63e61962db9ff2ec024249fac9c
parent591a6e8ee7c8ffbbeaf23fec23796c0cfa316a41 (diff)
libata: kill ATA_ENABLE_PATA
The ATA_ENABLE_PATA define was never meant to be permanent, and in recent kernels, it's already been unconditionally enabled. Remove. Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/ata/ata_piix.c2
-rw-r--r--include/linux/libata.h2
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/ata/ata_piix.c b/drivers/ata/ata_piix.c
index c528d42ee106..4d716c7347e7 100644
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
@@ -164,7 +164,6 @@ static void ich_set_dmamode (struct ata_port *ap, struct ata_device *adev);
164static unsigned int in_module_init = 1; 164static unsigned int in_module_init = 1;
165 165
166static const struct pci_device_id piix_pci_tbl[] = { 166static const struct pci_device_id piix_pci_tbl[] = {
167#ifdef ATA_ENABLE_PATA
168 /* Intel PIIX3 for the 430HX etc */ 167 /* Intel PIIX3 for the 430HX etc */
169 { 0x8086, 0x7010, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_mwdma }, 168 { 0x8086, 0x7010, PCI_ANY_ID, PCI_ANY_ID, 0, 0, piix_pata_mwdma },
170 /* Intel PIIX4 for the 430TX/440BX/MX chipset: UDMA 33 */ 169 /* Intel PIIX4 for the 430TX/440BX/MX chipset: UDMA 33 */
@@ -204,7 +203,6 @@ static const struct pci_device_id piix_pci_tbl[] = {
204 /* ICH7/7-R (i945, i975) UDMA 100*/ 203 /* ICH7/7-R (i945, i975) UDMA 100*/
205 { 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_133 }, 204 { 0x8086, 0x27DF, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_133 },
206 { 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 }, 205 { 0x8086, 0x269E, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich_pata_100 },
207#endif
208 206
209 /* NOTE: The following PCI ids must be kept in sync with the 207 /* NOTE: The following PCI ids must be kept in sync with the
210 * list in drivers/pci/quirks.c. 208 * list in drivers/pci/quirks.c.
diff --git a/include/linux/libata.h b/include/linux/libata.h
index bdfe6ea8edf7..596e0c18887d 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -54,8 +54,6 @@
54#undef ATA_VERBOSE_DEBUG /* yet more debugging output */ 54#undef ATA_VERBOSE_DEBUG /* yet more debugging output */
55#undef ATA_IRQ_TRAP /* define to ack screaming irqs */ 55#undef ATA_IRQ_TRAP /* define to ack screaming irqs */
56#undef ATA_NDEBUG /* define to disable quick runtime checks */ 56#undef ATA_NDEBUG /* define to disable quick runtime checks */
57#define ATA_ENABLE_PATA /* define to enable PATA support in some
58 * low-level drivers */
59 57
60 58
61/* note: prints function name for you */ 59/* note: prints function name for you */