22 files changed, 21 insertions, 21 deletions
diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c
index a454451c97c3..eca558c6bf5d 100644
--- a/arch/arm/mach-rpc/riscpc.c
+++ b/arch/arm/mach-rpc/riscpc.c
@@ -17,7 +17,7 @@
 #include <linux/sched.h>
 #include <linux/device.h>
 #include <linux/serial_8250.h>
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <asm/elf.h>
 #include <asm/io.h>
diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c
index f8c411a24af7..1795aab79064 100644
--- a/arch/blackfin/mach-bf527/boards/ezkit.c
+++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -37,7 +37,7 @@
 #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
 #include <linux/usb/isp1362.h>
 #endif
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/usb/sl811.h>
diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c
index a72c7a620fa1..97378b0a9753 100644
--- a/arch/blackfin/mach-bf533/boards/H8606.c
+++ b/arch/blackfin/mach-bf533/boards/H8606.c
@@ -38,7 +38,7 @@
 #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
 #include <linux/usb/isp1362.h>
 #endif
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <linux/irq.h>
 #include <asm/dma.h>
diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c
index 21df2f375497..886f260d9359 100644
--- a/arch/blackfin/mach-bf533/boards/cm_bf533.c
+++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c
@@ -34,7 +34,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb/isp1362.h>
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <linux/irq.h>
 #include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c
index c37dd45c8803..4026c2f3ab4e 100644
--- a/arch/blackfin/mach-bf533/boards/ezkit.c
+++ b/arch/blackfin/mach-bf533/boards/ezkit.c
@@ -35,7 +35,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb/isp1362.h>
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <linux/irq.h>
 #include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c
index ac52b040b336..0185350feacc 100644
--- a/arch/blackfin/mach-bf533/boards/stamp.c
+++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -38,7 +38,7 @@
 #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
 #include <linux/usb/isp1362.h>
 #endif
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <linux/irq.h>
 #include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c
index 8703b67d5ec6..f7c1f964f13b 100644
--- a/arch/blackfin/mach-bf537/boards/cm_bf537.c
+++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c
@@ -36,7 +36,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb/isp1362.h>
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <linux/irq.h>
 #include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c
index 3e52f3f5bd58..8a3397db1d21 100644
--- a/arch/blackfin/mach-bf537/boards/generic_board.c
+++ b/arch/blackfin/mach-bf537/boards/generic_board.c
@@ -38,7 +38,7 @@
 #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
 #include <linux/usb/isp1362.h>
 #endif
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/usb/sl811.h>
diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c
index b8bbba85af53..d71e0be33921 100644
--- a/arch/blackfin/mach-bf537/boards/minotaur.c
+++ b/arch/blackfin/mach-bf537/boards/minotaur.c
@@ -10,7 +10,7 @@
 #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
 #include <linux/usb_isp1362.h>
 #endif
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/usb_sl811.h>
diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c
index 772541548b76..119e6ea83384 100644
--- a/arch/blackfin/mach-bf537/boards/stamp.c
+++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -38,7 +38,7 @@
 #if defined(CONFIG_USB_ISP1362_HCD) || defined(CONFIG_USB_ISP1362_HCD_MODULE)
 #include <linux/usb/isp1362.h>
 #endif
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/usb/sl811.h>
diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c
index 3a79a9061bdc..bf9e738a7c64 100644
--- a/arch/blackfin/mach-bf561/boards/cm_bf561.c
+++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c
@@ -34,7 +34,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/usb/isp1362.h>
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <linux/irq.h>
 #include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c
index 7601c3be1b5c..ed863ce9a2d8 100644
--- a/arch/blackfin/mach-bf561/boards/ezkit.c
+++ b/arch/blackfin/mach-bf561/boards/ezkit.c
@@ -35,7 +35,7 @@
 #include <linux/spi/spi.h>
 #include <linux/irq.h>
 #include <linux/interrupt.h>
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <asm/dma.h>
 #include <asm/bfin5xx_spi.h>
 #include <asm/portmux.h>
diff --git a/arch/sh/boards/landisk/setup.c b/arch/sh/boards/landisk/setup.c
index eda71763ecc5..2b708ec72558 100644
--- a/arch/sh/boards/landisk/setup.c
+++ b/arch/sh/boards/landisk/setup.c
@@ -14,7 +14,7 @@
 */
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <linux/pm.h>
 #include <linux/mm.h>
 #include <asm/machvec.h>
diff --git a/arch/sh/boards/lboxre2/setup.c b/arch/sh/boards/lboxre2/setup.c
index 9c830fdc411b..c74440d38ee9 100644
--- a/arch/sh/boards/lboxre2/setup.c
+++ b/arch/sh/boards/lboxre2/setup.c
@@ -13,7 +13,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <asm/machvec.h>
 #include <asm/addrspace.h>
 #include <asm/lboxre2.h>
diff --git a/arch/sh/boards/renesas/r7780rp/setup.c b/arch/sh/boards/renesas/r7780rp/setup.c
index a43b47726f54..f7a8d5c9d510 100644
--- a/arch/sh/boards/renesas/r7780rp/setup.c
+++ b/arch/sh/boards/renesas/r7780rp/setup.c
@@ -15,7 +15,7 @@
 */
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <linux/types.h>
 #include <net/ax88796.h>
 #include <asm/machvec.h>
diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/renesas/rts7751r2d/setup.c
index 3452b072adde..a0ef81b7de37 100644
--- a/arch/sh/boards/renesas/rts7751r2d/setup.c
+++ b/arch/sh/boards/renesas/rts7751r2d/setup.c
@@ -10,7 +10,7 @@
 */
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <linux/serial_8250.h>
 #include <linux/sm501.h>
 #include <linux/sm501-regs.h>
diff --git a/arch/sh/boards/renesas/sdk7780/setup.c b/arch/sh/boards/renesas/sdk7780/setup.c
index 5df32f201870..acc5932587f1 100644
--- a/arch/sh/boards/renesas/sdk7780/setup.c
+++ b/arch/sh/boards/renesas/sdk7780/setup.c
@@ -11,7 +11,7 @@
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/platform_device.h>
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <asm/machvec.h>
 #include <asm/sdk7780.h>
 #include <asm/heartbeat.h>
diff --git a/arch/sh/boards/se/7722/setup.c b/arch/sh/boards/se/7722/setup.c
index eb97dca5b736..b1a3d9d0172f 100644
--- a/arch/sh/boards/se/7722/setup.c
+++ b/arch/sh/boards/se/7722/setup.c
@@ -12,7 +12,7 @@
 */
 #include <linux/init.h>
 #include <linux/platform_device.h>
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <asm/machvec.h>
 #include <asm/se7722.h>
 #include <asm/io.h>
diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c
index 938f48a807eb..408da30594c4 100644
--- a/drivers/ata/pata_of_platform.c
+++ b/drivers/ata/pata_of_platform.c
@@ -12,7 +12,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/of_platform.h>
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 static int __devinit pata_of_platform_probe(struct of_device *ofdev,
                                            const struct of_device_id *match)
diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c
index 224bb6c2030a..aad7adc6ea56 100644
--- a/drivers/ata/pata_platform.c
+++ b/drivers/ata/pata_platform.c
@@ -19,7 +19,7 @@
 #include <linux/ata.h>
 #include <linux/libata.h>
 #include <linux/platform_device.h>
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #define DRV_NAME "pata_platform"
 #define DRV_VERSION "1.2"
diff --git a/drivers/ide/legacy/ide_platform.c b/drivers/ide/legacy/ide_platform.c
index 26c82ce602de..688fcae17488 100644
--- a/drivers/ide/legacy/ide_platform.c
+++ b/drivers/ide/legacy/ide_platform.c
@@ -17,7 +17,7 @@
 #include <linux/ide.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
-#include <linux/pata_platform.h>
+#include <linux/ata_platform.h>
 #include <linux/platform_device.h>
 #include <linux/io.h>
diff --git a/include/linux/pata_platform.h b/include/linux/ata_platform.h
index 6a7a92db294c..6a7a92db294c 100644
--- a/include/linux/pata_platform.h
+++ b/include/linux/ata_platform.h

diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c index a454451c97c3..eca558c6bf5d 100644 --- a/arch/arm/mach-rpc/riscpc.c +++ b/arch/arm/mach-rpc/riscpc.c
@@ -17,7 +17,7 @@
17	#include <linux/sched.h>	17	#include <linux/sched.h>
18	#include <linux/device.h>	18	#include <linux/device.h>
19	#include <linux/serial_8250.h>	19	#include <linux/serial_8250.h>
20	#include <linux/pata_platform.h>	20	#include <linux/ata_platform.h>
21		21
22	#include <asm/elf.h>	22	#include <asm/elf.h>
23	#include <asm/io.h>	23	#include <asm/io.h>


diff --git a/arch/blackfin/mach-bf527/boards/ezkit.c b/arch/blackfin/mach-bf527/boards/ezkit.c index f8c411a24af7..1795aab79064 100644 --- a/arch/blackfin/mach-bf527/boards/ezkit.c +++ b/arch/blackfin/mach-bf527/boards/ezkit.c
@@ -37,7 +37,7 @@
37	#if defined(CONFIG_USB_ISP1362_HCD) \|\| defined(CONFIG_USB_ISP1362_HCD_MODULE)	37	#if defined(CONFIG_USB_ISP1362_HCD) \|\| defined(CONFIG_USB_ISP1362_HCD_MODULE)
38	#include <linux/usb/isp1362.h>	38	#include <linux/usb/isp1362.h>
39	#endif	39	#endif
40	#include <linux/pata_platform.h>	40	#include <linux/ata_platform.h>
41	#include <linux/irq.h>	41	#include <linux/irq.h>
42	#include <linux/interrupt.h>	42	#include <linux/interrupt.h>
43	#include <linux/usb/sl811.h>	43	#include <linux/usb/sl811.h>


diff --git a/arch/blackfin/mach-bf533/boards/H8606.c b/arch/blackfin/mach-bf533/boards/H8606.c index a72c7a620fa1..97378b0a9753 100644 --- a/arch/blackfin/mach-bf533/boards/H8606.c +++ b/arch/blackfin/mach-bf533/boards/H8606.c
@@ -38,7 +38,7 @@
38	#if defined(CONFIG_USB_ISP1362_HCD) \|\| defined(CONFIG_USB_ISP1362_HCD_MODULE)	38	#if defined(CONFIG_USB_ISP1362_HCD) \|\| defined(CONFIG_USB_ISP1362_HCD_MODULE)
39	#include <linux/usb/isp1362.h>	39	#include <linux/usb/isp1362.h>
40	#endif	40	#endif
41	#include <linux/pata_platform.h>	41	#include <linux/ata_platform.h>
42	#include <linux/irq.h>	42	#include <linux/irq.h>
43		43
44	#include <asm/dma.h>	44	#include <asm/dma.h>


diff --git a/arch/blackfin/mach-bf533/boards/cm_bf533.c b/arch/blackfin/mach-bf533/boards/cm_bf533.c index 21df2f375497..886f260d9359 100644 --- a/arch/blackfin/mach-bf533/boards/cm_bf533.c +++ b/arch/blackfin/mach-bf533/boards/cm_bf533.c
@@ -34,7 +34,7 @@
34	#include <linux/spi/spi.h>	34	#include <linux/spi/spi.h>
35	#include <linux/spi/flash.h>	35	#include <linux/spi/flash.h>
36	#include <linux/usb/isp1362.h>	36	#include <linux/usb/isp1362.h>
37	#include <linux/pata_platform.h>	37	#include <linux/ata_platform.h>
38	#include <linux/irq.h>	38	#include <linux/irq.h>
39	#include <asm/dma.h>	39	#include <asm/dma.h>
40	#include <asm/bfin5xx_spi.h>	40	#include <asm/bfin5xx_spi.h>


diff --git a/arch/blackfin/mach-bf533/boards/ezkit.c b/arch/blackfin/mach-bf533/boards/ezkit.c index c37dd45c8803..4026c2f3ab4e 100644 --- a/arch/blackfin/mach-bf533/boards/ezkit.c +++ b/arch/blackfin/mach-bf533/boards/ezkit.c
@@ -35,7 +35,7 @@
35	#include <linux/spi/spi.h>	35	#include <linux/spi/spi.h>
36	#include <linux/spi/flash.h>	36	#include <linux/spi/flash.h>
37	#include <linux/usb/isp1362.h>	37	#include <linux/usb/isp1362.h>
38	#include <linux/pata_platform.h>	38	#include <linux/ata_platform.h>
39	#include <linux/irq.h>	39	#include <linux/irq.h>
40	#include <asm/dma.h>	40	#include <asm/dma.h>
41	#include <asm/bfin5xx_spi.h>	41	#include <asm/bfin5xx_spi.h>


diff --git a/arch/blackfin/mach-bf533/boards/stamp.c b/arch/blackfin/mach-bf533/boards/stamp.c index ac52b040b336..0185350feacc 100644 --- a/arch/blackfin/mach-bf533/boards/stamp.c +++ b/arch/blackfin/mach-bf533/boards/stamp.c
@@ -38,7 +38,7 @@
38	#if defined(CONFIG_USB_ISP1362_HCD) \|\| defined(CONFIG_USB_ISP1362_HCD_MODULE)	38	#if defined(CONFIG_USB_ISP1362_HCD) \|\| defined(CONFIG_USB_ISP1362_HCD_MODULE)
39	#include <linux/usb/isp1362.h>	39	#include <linux/usb/isp1362.h>
40	#endif	40	#endif
41	#include <linux/pata_platform.h>	41	#include <linux/ata_platform.h>
42	#include <linux/irq.h>	42	#include <linux/irq.h>
43	#include <asm/dma.h>	43	#include <asm/dma.h>
44	#include <asm/bfin5xx_spi.h>	44	#include <asm/bfin5xx_spi.h>


diff --git a/arch/blackfin/mach-bf537/boards/cm_bf537.c b/arch/blackfin/mach-bf537/boards/cm_bf537.c index 8703b67d5ec6..f7c1f964f13b 100644 --- a/arch/blackfin/mach-bf537/boards/cm_bf537.c +++ b/arch/blackfin/mach-bf537/boards/cm_bf537.c
@@ -36,7 +36,7 @@
36	#include <linux/spi/spi.h>	36	#include <linux/spi/spi.h>
37	#include <linux/spi/flash.h>	37	#include <linux/spi/flash.h>
38	#include <linux/usb/isp1362.h>	38	#include <linux/usb/isp1362.h>
39	#include <linux/pata_platform.h>	39	#include <linux/ata_platform.h>
40	#include <linux/irq.h>	40	#include <linux/irq.h>
41	#include <asm/dma.h>	41	#include <asm/dma.h>
42	#include <asm/bfin5xx_spi.h>	42	#include <asm/bfin5xx_spi.h>


diff --git a/arch/blackfin/mach-bf537/boards/generic_board.c b/arch/blackfin/mach-bf537/boards/generic_board.c index 3e52f3f5bd58..8a3397db1d21 100644 --- a/arch/blackfin/mach-bf537/boards/generic_board.c +++ b/arch/blackfin/mach-bf537/boards/generic_board.c
@@ -38,7 +38,7 @@
38	#if defined(CONFIG_USB_ISP1362_HCD) \|\| defined(CONFIG_USB_ISP1362_HCD_MODULE)	38	#if defined(CONFIG_USB_ISP1362_HCD) \|\| defined(CONFIG_USB_ISP1362_HCD_MODULE)
39	#include <linux/usb/isp1362.h>	39	#include <linux/usb/isp1362.h>
40	#endif	40	#endif
41	#include <linux/pata_platform.h>	41	#include <linux/ata_platform.h>
42	#include <linux/irq.h>	42	#include <linux/irq.h>
43	#include <linux/interrupt.h>	43	#include <linux/interrupt.h>
44	#include <linux/usb/sl811.h>	44	#include <linux/usb/sl811.h>


diff --git a/arch/blackfin/mach-bf537/boards/minotaur.c b/arch/blackfin/mach-bf537/boards/minotaur.c index b8bbba85af53..d71e0be33921 100644 --- a/arch/blackfin/mach-bf537/boards/minotaur.c +++ b/arch/blackfin/mach-bf537/boards/minotaur.c
@@ -10,7 +10,7 @@
10	#if defined(CONFIG_USB_ISP1362_HCD) \|\| defined(CONFIG_USB_ISP1362_HCD_MODULE)	10	#if defined(CONFIG_USB_ISP1362_HCD) \|\| defined(CONFIG_USB_ISP1362_HCD_MODULE)
11	#include <linux/usb_isp1362.h>	11	#include <linux/usb_isp1362.h>
12	#endif	12	#endif
13	#include <linux/pata_platform.h>	13	#include <linux/ata_platform.h>
14	#include <linux/irq.h>	14	#include <linux/irq.h>
15	#include <linux/interrupt.h>	15	#include <linux/interrupt.h>
16	#include <linux/usb_sl811.h>	16	#include <linux/usb_sl811.h>


diff --git a/arch/blackfin/mach-bf537/boards/stamp.c b/arch/blackfin/mach-bf537/boards/stamp.c index 772541548b76..119e6ea83384 100644 --- a/arch/blackfin/mach-bf537/boards/stamp.c +++ b/arch/blackfin/mach-bf537/boards/stamp.c
@@ -38,7 +38,7 @@
38	#if defined(CONFIG_USB_ISP1362_HCD) \|\| defined(CONFIG_USB_ISP1362_HCD_MODULE)	38	#if defined(CONFIG_USB_ISP1362_HCD) \|\| defined(CONFIG_USB_ISP1362_HCD_MODULE)
39	#include <linux/usb/isp1362.h>	39	#include <linux/usb/isp1362.h>
40	#endif	40	#endif
41	#include <linux/pata_platform.h>	41	#include <linux/ata_platform.h>
42	#include <linux/irq.h>	42	#include <linux/irq.h>
43	#include <linux/interrupt.h>	43	#include <linux/interrupt.h>
44	#include <linux/usb/sl811.h>	44	#include <linux/usb/sl811.h>


diff --git a/arch/blackfin/mach-bf561/boards/cm_bf561.c b/arch/blackfin/mach-bf561/boards/cm_bf561.c index 3a79a9061bdc..bf9e738a7c64 100644 --- a/arch/blackfin/mach-bf561/boards/cm_bf561.c +++ b/arch/blackfin/mach-bf561/boards/cm_bf561.c
@@ -34,7 +34,7 @@
34	#include <linux/spi/spi.h>	34	#include <linux/spi/spi.h>
35	#include <linux/spi/flash.h>	35	#include <linux/spi/flash.h>
36	#include <linux/usb/isp1362.h>	36	#include <linux/usb/isp1362.h>
37	#include <linux/pata_platform.h>	37	#include <linux/ata_platform.h>
38	#include <linux/irq.h>	38	#include <linux/irq.h>
39	#include <asm/dma.h>	39	#include <asm/dma.h>
40	#include <asm/bfin5xx_spi.h>	40	#include <asm/bfin5xx_spi.h>


diff --git a/arch/blackfin/mach-bf561/boards/ezkit.c b/arch/blackfin/mach-bf561/boards/ezkit.c index 7601c3be1b5c..ed863ce9a2d8 100644 --- a/arch/blackfin/mach-bf561/boards/ezkit.c +++ b/arch/blackfin/mach-bf561/boards/ezkit.c
@@ -35,7 +35,7 @@
35	#include <linux/spi/spi.h>	35	#include <linux/spi/spi.h>
36	#include <linux/irq.h>	36	#include <linux/irq.h>
37	#include <linux/interrupt.h>	37	#include <linux/interrupt.h>
38	#include <linux/pata_platform.h>	38	#include <linux/ata_platform.h>
39	#include <asm/dma.h>	39	#include <asm/dma.h>
40	#include <asm/bfin5xx_spi.h>	40	#include <asm/bfin5xx_spi.h>
41	#include <asm/portmux.h>	41	#include <asm/portmux.h>


diff --git a/arch/sh/boards/landisk/setup.c b/arch/sh/boards/landisk/setup.c index eda71763ecc5..2b708ec72558 100644 --- a/arch/sh/boards/landisk/setup.c +++ b/arch/sh/boards/landisk/setup.c
@@ -14,7 +14,7 @@
14	*/	14	*/
15	#include <linux/init.h>	15	#include <linux/init.h>
16	#include <linux/platform_device.h>	16	#include <linux/platform_device.h>
17	#include <linux/pata_platform.h>	17	#include <linux/ata_platform.h>
18	#include <linux/pm.h>	18	#include <linux/pm.h>
19	#include <linux/mm.h>	19	#include <linux/mm.h>
20	#include <asm/machvec.h>	20	#include <asm/machvec.h>


diff --git a/arch/sh/boards/lboxre2/setup.c b/arch/sh/boards/lboxre2/setup.c index 9c830fdc411b..c74440d38ee9 100644 --- a/arch/sh/boards/lboxre2/setup.c +++ b/arch/sh/boards/lboxre2/setup.c
@@ -13,7 +13,7 @@
13		13
14	#include <linux/init.h>	14	#include <linux/init.h>
15	#include <linux/platform_device.h>	15	#include <linux/platform_device.h>
16	#include <linux/pata_platform.h>	16	#include <linux/ata_platform.h>
17	#include <asm/machvec.h>	17	#include <asm/machvec.h>
18	#include <asm/addrspace.h>	18	#include <asm/addrspace.h>
19	#include <asm/lboxre2.h>	19	#include <asm/lboxre2.h>


diff --git a/arch/sh/boards/renesas/r7780rp/setup.c b/arch/sh/boards/renesas/r7780rp/setup.c index a43b47726f54..f7a8d5c9d510 100644 --- a/arch/sh/boards/renesas/r7780rp/setup.c +++ b/arch/sh/boards/renesas/r7780rp/setup.c
@@ -15,7 +15,7 @@
15	*/	15	*/
16	#include <linux/init.h>	16	#include <linux/init.h>
17	#include <linux/platform_device.h>	17	#include <linux/platform_device.h>
18	#include <linux/pata_platform.h>	18	#include <linux/ata_platform.h>
19	#include <linux/types.h>	19	#include <linux/types.h>
20	#include <net/ax88796.h>	20	#include <net/ax88796.h>
21	#include <asm/machvec.h>	21	#include <asm/machvec.h>


diff --git a/arch/sh/boards/renesas/rts7751r2d/setup.c b/arch/sh/boards/renesas/rts7751r2d/setup.c index 3452b072adde..a0ef81b7de37 100644 --- a/arch/sh/boards/renesas/rts7751r2d/setup.c +++ b/arch/sh/boards/renesas/rts7751r2d/setup.c
@@ -10,7 +10,7 @@
10	*/	10	*/
11	#include <linux/init.h>	11	#include <linux/init.h>
12	#include <linux/platform_device.h>	12	#include <linux/platform_device.h>
13	#include <linux/pata_platform.h>	13	#include <linux/ata_platform.h>
14	#include <linux/serial_8250.h>	14	#include <linux/serial_8250.h>
15	#include <linux/sm501.h>	15	#include <linux/sm501.h>
16	#include <linux/sm501-regs.h>	16	#include <linux/sm501-regs.h>


diff --git a/arch/sh/boards/renesas/sdk7780/setup.c b/arch/sh/boards/renesas/sdk7780/setup.c index 5df32f201870..acc5932587f1 100644 --- a/arch/sh/boards/renesas/sdk7780/setup.c +++ b/arch/sh/boards/renesas/sdk7780/setup.c
@@ -11,7 +11,7 @@
11	#include <linux/init.h>	11	#include <linux/init.h>
12	#include <linux/types.h>	12	#include <linux/types.h>
13	#include <linux/platform_device.h>	13	#include <linux/platform_device.h>
14	#include <linux/pata_platform.h>	14	#include <linux/ata_platform.h>
15	#include <asm/machvec.h>	15	#include <asm/machvec.h>
16	#include <asm/sdk7780.h>	16	#include <asm/sdk7780.h>
17	#include <asm/heartbeat.h>	17	#include <asm/heartbeat.h>


diff --git a/arch/sh/boards/se/7722/setup.c b/arch/sh/boards/se/7722/setup.c index eb97dca5b736..b1a3d9d0172f 100644 --- a/arch/sh/boards/se/7722/setup.c +++ b/arch/sh/boards/se/7722/setup.c
@@ -12,7 +12,7 @@
12	*/	12	*/
13	#include <linux/init.h>	13	#include <linux/init.h>
14	#include <linux/platform_device.h>	14	#include <linux/platform_device.h>
15	#include <linux/pata_platform.h>	15	#include <linux/ata_platform.h>
16	#include <asm/machvec.h>	16	#include <asm/machvec.h>
17	#include <asm/se7722.h>	17	#include <asm/se7722.h>
18	#include <asm/io.h>	18	#include <asm/io.h>


diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c index 938f48a807eb..408da30594c4 100644 --- a/drivers/ata/pata_of_platform.c +++ b/drivers/ata/pata_of_platform.c
@@ -12,7 +12,7 @@
12	#include <linux/kernel.h>	12	#include <linux/kernel.h>
13	#include <linux/module.h>	13	#include <linux/module.h>
14	#include <linux/of_platform.h>	14	#include <linux/of_platform.h>
15	#include <linux/pata_platform.h>	15	#include <linux/ata_platform.h>
16		16
17	static int __devinit pata_of_platform_probe(struct of_device *ofdev,	17	static int __devinit pata_of_platform_probe(struct of_device *ofdev,
18	const struct of_device_id *match)	18	const struct of_device_id *match)


diff --git a/drivers/ata/pata_platform.c b/drivers/ata/pata_platform.c index 224bb6c2030a..aad7adc6ea56 100644 --- a/drivers/ata/pata_platform.c +++ b/drivers/ata/pata_platform.c
@@ -19,7 +19,7 @@
19	#include <linux/ata.h>	19	#include <linux/ata.h>
20	#include <linux/libata.h>	20	#include <linux/libata.h>
21	#include <linux/platform_device.h>	21	#include <linux/platform_device.h>
22	#include <linux/pata_platform.h>	22	#include <linux/ata_platform.h>
23		23
24	#define DRV_NAME "pata_platform"	24	#define DRV_NAME "pata_platform"
25	#define DRV_VERSION "1.2"	25	#define DRV_VERSION "1.2"


diff --git a/drivers/ide/legacy/ide_platform.c b/drivers/ide/legacy/ide_platform.c index 26c82ce602de..688fcae17488 100644 --- a/drivers/ide/legacy/ide_platform.c +++ b/drivers/ide/legacy/ide_platform.c
@@ -17,7 +17,7 @@
17	#include <linux/ide.h>	17	#include <linux/ide.h>
18	#include <linux/ioport.h>	18	#include <linux/ioport.h>
19	#include <linux/module.h>	19	#include <linux/module.h>
20	#include <linux/pata_platform.h>	20	#include <linux/ata_platform.h>
21	#include <linux/platform_device.h>	21	#include <linux/platform_device.h>
22	#include <linux/io.h>	22	#include <linux/io.h>
23		23


diff --git a/include/linux/pata_platform.h b/include/linux/ata_platform.h index 6a7a92db294c..6a7a92db294c 100644 --- a/include/linux/pata_platform.h +++ b/include/linux/ata_platform.h