34 files changed, 34 insertions, 34 deletions
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index 4db5de54b6a..29d63fa68f3 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -28,7 +28,7 @@
 #include <asm/mach/arch.h>
 #include <linux/irq.h>
 #include <plat/time.h>
-#include <plat/ehci-orion.h>
+#include <linux/platform_data/usb-ehci-orion.h>
 #include <plat/common.h>
 #include <plat/addr-map.h>
 #include "common.h"
diff --git a/arch/arm/mach-kirkwood/board-dreamplug.c b/arch/arm/mach-kirkwood/board-dreamplug.c
index aeb234d0d0e..20af53a56c0 100644
--- a/arch/arm/mach-kirkwood/board-dreamplug.c
+++ b/arch/arm/mach-kirkwood/board-dreamplug.c
@@ -30,7 +30,7 @@
 #include <asm/mach/map.h>
 #include <mach/kirkwood.h>
 #include <mach/bridge-regs.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 #include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/board-goflexnet.c
index 413e2c8ef5f..001ca8c9698 100644
--- a/arch/arm/mach-kirkwood/board-goflexnet.c
+++ b/arch/arm/mach-kirkwood/board-goflexnet.c
@@ -32,7 +32,7 @@
 #include <asm/mach/map.h>
 #include <mach/kirkwood.h>
 #include <mach/bridge-regs.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 #include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index c4b64adcbfc..bd5ea6913e5 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -26,15 +26,15 @@
 #include <asm/mach/time.h>
 #include <mach/kirkwood.h>
 #include <mach/bridge-regs.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-kirkwood.h>
 #include <plat/cache-feroceon-l2.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
-#include <plat/orion_nand.h>
+#include <linux/platform_data/mtd-orion_nand.h>
-#include <plat/ehci-orion.h>
+#include <linux/platform_data/usb-ehci-orion.h>
 #include <plat/common.h>
 #include <plat/time.h>
 #include <plat/addr-map.h>
-#include <plat/mv_xor.h>
+#include <linux/platform_data/dma-mv_xor.h>
 #include "common.h"
 /*****************************************************************************
diff --git a/arch/arm/mach-kirkwood/d2net_v2-setup.c b/arch/arm/mach-kirkwood/d2net_v2-setup.c
index 6e1bac929ab..2c1a453df20 100644
--- a/arch/arm/mach-kirkwood/d2net_v2-setup.c
+++ b/arch/arm/mach-kirkwood/d2net_v2-setup.c
@@ -32,7 +32,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <mach/leds-ns2.h>
+#include <linux/platform_data/leds-kirkwood-ns2.h>
 #include "common.h"
 #include "mpp.h"
 #include "lacie_v2-common.h"
diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
index d9335937959..044a631ce24 100644
--- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
+++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
@@ -17,7 +17,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 #include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
index 61d9a552a05..23dcb19cc2a 100644
--- a/arch/arm/mach-kirkwood/dockstar-setup.c
+++ b/arch/arm/mach-kirkwood/dockstar-setup.c
@@ -19,7 +19,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 #include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
index bdaed3867d1..7cb55f98224 100644
--- a/arch/arm/mach-kirkwood/guruplug-setup.c
+++ b/arch/arm/mach-kirkwood/guruplug-setup.c
@@ -19,7 +19,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 #include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/netspace_v2-setup.c
index e6bba01bae3..88b0788baca 100644
--- a/arch/arm/mach-kirkwood/netspace_v2-setup.c
+++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c
@@ -34,7 +34,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <mach/leds-ns2.h>
+#include <linux/platform_data/leds-kirkwood-ns2.h>
 #include "common.h"
 #include "mpp.h"
 #include "lacie_v2-common.h"
diff --git a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/netxbig_v2-setup.c
index 31ae8de34e9..a3b091470b8 100644
--- a/arch/arm/mach-kirkwood/netxbig_v2-setup.c
+++ b/arch/arm/mach-kirkwood/netxbig_v2-setup.c
@@ -32,7 +32,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <mach/leds-netxbig.h>
+#include <linux/platform_data/leds-kirkwood-netxbig.h>
 #include "common.h"
 #include "mpp.h"
 #include "lacie_v2-common.h"
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c
index 7e99c3f340f..134ef50d58f 100644
--- a/arch/arm/mach-kirkwood/openrd-setup.c
+++ b/arch/arm/mach-kirkwood/openrd-setup.c
@@ -20,7 +20,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 #include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
index ef922079348..9717101a743 100644
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c
@@ -20,7 +20,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 #include "mpp.h"
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
index 4ea70e5f713..28d0abaf4bd 100644
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
+++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
@@ -19,7 +19,7 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <mach/kirkwood.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "common.h"
 #include "mpp.h"
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index b4c53b846c9..26de7f48809 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -20,8 +20,8 @@
 #include <mach/mv78xx0.h>
 #include <mach/bridge-regs.h>
 #include <plat/cache-feroceon-l2.h>
-#include <plat/ehci-orion.h>
+#include <linux/platform_data/usb-ehci-orion.h>
-#include <plat/orion_nand.h>
+#include <linux/platform_data/mtd-orion_nand.h>
 #include <plat/time.h>
 #include <plat/common.h>
 #include <plat/addr-map.h>
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index 9148b229d0d..ca67e825181 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -30,8 +30,8 @@
 #include <mach/bridge-regs.h>
 #include <mach/hardware.h>
 #include <mach/orion5x.h>
-#include <plat/orion_nand.h>
+#include <linux/platform_data/mtd-orion_nand.h>
-#include <plat/ehci-orion.h>
+#include <linux/platform_data/usb-ehci-orion.h>
 #include <plat/time.h>
 #include <plat/common.h>
 #include <plat/addr-map.h>
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index 49a3fd63031..41fe2b1ff47 100644
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -24,7 +24,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
 #include <mach/orion5x.h>
-#include <plat/orion_nand.h>
+#include <linux/platform_data/mtd-orion_nand.h>
 #include "common.h"
 #include "mpp.h"
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
index 1e458efafb9..f1ae10ae5bd 100644
--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -24,7 +24,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/pci.h>
 #include <mach/orion5x.h>
-#include <plat/orion_nand.h>
+#include <linux/platform_data/mtd-orion_nand.h>
 #include "common.h"
 #include "mpp.h"
diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c
index d245a87dc01..9148eb0fe33 100644
--- a/arch/arm/plat-orion/common.c
+++ b/arch/arm/plat-orion/common.c
@@ -19,8 +19,8 @@
 #include <linux/mv643xx_eth.h>
 #include <linux/mv643xx_i2c.h>
 #include <net/dsa.h>
-#include <plat/mv_xor.h>
+#include <linux/platform_data/dma-mv_xor.h>
-#include <plat/ehci-orion.h>
+#include <linux/platform_data/usb-ehci-orion.h>
 #include <mach/bridge-regs.h>
 /* Create a clkdev entry for a given device/clk */
diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c
index 0b12e68bf79..e362e2b80ef 100644
--- a/drivers/dma/mv_xor.c
+++ b/drivers/dma/mv_xor.c
@@ -26,7 +26,7 @@
 #include <linux/platform_device.h>
 #include <linux/memory.h>
 #include <linux/clk.h>
-#include <plat/mv_xor.h>
+#include <linux/platform_data/dma-mv_xor.h>
 #include "dmaengine.h"
 #include "mv_xor.h"
diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c
index e37618e363c..461bbf9b33f 100644
--- a/drivers/leds/leds-netxbig.c
+++ b/drivers/leds/leds-netxbig.c
@@ -28,7 +28,7 @@
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/leds.h>
-#include <mach/leds-netxbig.h>
+#include <linux/platform_data/leds-kirkwood-netxbig.h>
 /*
 * GPIO extension bus.
diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c
index 10528dafb04..d176ec83f5d 100644
--- a/drivers/leds/leds-ns2.c
+++ b/drivers/leds/leds-ns2.c
@@ -29,7 +29,7 @@
 #include <linux/gpio.h>
 #include <linux/leds.h>
 #include <linux/module.h>
-#include <mach/leds-ns2.h>
+#include <linux/platform_data/leds-kirkwood-ns2.h>
 /*
 * The Network Space v2 dual-GPIO LED is wired to a CPLD and can blink in
diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c
index a61cb5fca22..de4c20b3936 100644
--- a/drivers/mmc/host/mvsdio.c
+++ b/drivers/mmc/host/mvsdio.c
@@ -25,7 +25,7 @@
 #include <asm/sizes.h>
 #include <asm/unaligned.h>
-#include <plat/mvsdio.h>
+#include <linux/platform_data/mmc-mvsdio.h>
 #include "mvsdio.h"
diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c
index fc5a868c436..131b58a133f 100644
--- a/drivers/mtd/nand/orion_nand.c
+++ b/drivers/mtd/nand/orion_nand.c
@@ -22,7 +22,7 @@
 #include <asm/io.h>
 #include <asm/sizes.h>
 #include <mach/hardware.h>
-#include <plat/orion_nand.h>
+#include <linux/platform_data/mtd-orion_nand.h>
 static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 {
diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c
index 8892d3642ce..8e7eca62f16 100644
--- a/drivers/usb/host/ehci-orion.c
+++ b/drivers/usb/host/ehci-orion.c
@@ -13,7 +13,7 @@
 #include <linux/platform_device.h>
 #include <linux/mbus.h>
 #include <linux/clk.h>
-#include <plat/ehci-orion.h>
+#include <linux/platform_data/usb-ehci-orion.h>
 #define rdl(off)        __raw_readl(hcd->regs + (off))
 #define wrl(off, val)   __raw_writel((val), hcd->regs + (off))
diff --git a/arch/arm/plat-orion/include/plat/audio.h b/include/linux/platform_data/asoc-kirkwood.h
index d6a55bd2e57..d6a55bd2e57 100644
--- a/arch/arm/plat-orion/include/plat/audio.h
+++ b/include/linux/platform_data/asoc-kirkwood.h
diff --git a/arch/arm/plat-orion/include/plat/mv_xor.h b/include/linux/platform_data/dma-mv_xor.h
index 2ba1f7d76ee..2ba1f7d76ee 100644
--- a/arch/arm/plat-orion/include/plat/mv_xor.h
+++ b/include/linux/platform_data/dma-mv_xor.h
diff --git a/arch/arm/mach-kirkwood/include/mach/leds-netxbig.h b/include/linux/platform_data/leds-kirkwood-netxbig.h
index 24b536ebdf1..24b536ebdf1 100644
--- a/arch/arm/mach-kirkwood/include/mach/leds-netxbig.h
+++ b/include/linux/platform_data/leds-kirkwood-netxbig.h
diff --git a/arch/arm/mach-kirkwood/include/mach/leds-ns2.h b/include/linux/platform_data/leds-kirkwood-ns2.h
index e21272e5f66..e21272e5f66 100644
--- a/arch/arm/mach-kirkwood/include/mach/leds-ns2.h
+++ b/include/linux/platform_data/leds-kirkwood-ns2.h
diff --git a/arch/arm/plat-orion/include/plat/mvsdio.h b/include/linux/platform_data/mmc-mvsdio.h
index 1190efedcb9..1190efedcb9 100644
--- a/arch/arm/plat-orion/include/plat/mvsdio.h
+++ b/include/linux/platform_data/mmc-mvsdio.h
diff --git a/arch/arm/plat-orion/include/plat/orion_nand.h b/include/linux/platform_data/mtd-orion_nand.h
index 9f3c180834d..9f3c180834d 100644
--- a/arch/arm/plat-orion/include/plat/orion_nand.h
+++ b/include/linux/platform_data/mtd-orion_nand.h
diff --git a/arch/arm/plat-orion/include/plat/ehci-orion.h b/include/linux/platform_data/usb-ehci-orion.h
index 6fc78e43042..6fc78e43042 100644
--- a/arch/arm/plat-orion/include/plat/ehci-orion.h
+++ b/include/linux/platform_data/usb-ehci-orion.h
diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c
index 7646dd7f30c..542538d10ab 100644
--- a/sound/soc/kirkwood/kirkwood-i2s.c
+++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -21,7 +21,7 @@
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-kirkwood.h>
 #include "kirkwood.h"
 #define DRV_NAME        "kirkwood-i2s"
diff --git a/sound/soc/kirkwood/kirkwood-openrd.c b/sound/soc/kirkwood/kirkwood-openrd.c
index 80bd59c33be..c28540aeea2 100644
--- a/sound/soc/kirkwood/kirkwood-openrd.c
+++ b/sound/soc/kirkwood/kirkwood-openrd.c
@@ -17,7 +17,7 @@
 #include <linux/slab.h>
 #include <sound/soc.h>
 #include <mach/kirkwood.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-kirkwood.h>
 #include <asm/mach-types.h>
 #include "../codecs/cs42l51.h"
diff --git a/sound/soc/kirkwood/kirkwood-t5325.c b/sound/soc/kirkwood/kirkwood-t5325.c
index f8983635f7e..c67bbc57498 100644
--- a/sound/soc/kirkwood/kirkwood-t5325.c
+++ b/sound/soc/kirkwood/kirkwood-t5325.c
@@ -16,7 +16,7 @@
 #include <linux/slab.h>
 #include <sound/soc.h>
 #include <mach/kirkwood.h>
-#include <plat/audio.h>
+#include <linux/platform_data/asoc-kirkwood.h>
 #include <asm/mach-types.h>
 #include "../codecs/alc5623.h"

diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c index 4db5de54b6a..29d63fa68f3 100644 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-dove/common.c
@@ -28,7 +28,7 @@
28	#include <asm/mach/arch.h>	28	#include <asm/mach/arch.h>
29	#include <linux/irq.h>	29	#include <linux/irq.h>
30	#include <plat/time.h>	30	#include <plat/time.h>
31	#include <plat/ehci-orion.h>	31	#include <linux/platform_data/usb-ehci-orion.h>
32	#include <plat/common.h>	32	#include <plat/common.h>
33	#include <plat/addr-map.h>	33	#include <plat/addr-map.h>
34	#include "common.h"	34	#include "common.h"


diff --git a/arch/arm/mach-kirkwood/board-dreamplug.c b/arch/arm/mach-kirkwood/board-dreamplug.c index aeb234d0d0e..20af53a56c0 100644 --- a/arch/arm/mach-kirkwood/board-dreamplug.c +++ b/arch/arm/mach-kirkwood/board-dreamplug.c
@@ -30,7 +30,7 @@
30	#include <asm/mach/map.h>	30	#include <asm/mach/map.h>
31	#include <mach/kirkwood.h>	31	#include <mach/kirkwood.h>
32	#include <mach/bridge-regs.h>	32	#include <mach/bridge-regs.h>
33	#include <plat/mvsdio.h>	33	#include <linux/platform_data/mmc-mvsdio.h>
34	#include "common.h"	34	#include "common.h"
35	#include "mpp.h"	35	#include "mpp.h"
36		36


diff --git a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/board-goflexnet.c index 413e2c8ef5f..001ca8c9698 100644 --- a/arch/arm/mach-kirkwood/board-goflexnet.c +++ b/arch/arm/mach-kirkwood/board-goflexnet.c
@@ -32,7 +32,7 @@
32	#include <asm/mach/map.h>	32	#include <asm/mach/map.h>
33	#include <mach/kirkwood.h>	33	#include <mach/kirkwood.h>
34	#include <mach/bridge-regs.h>	34	#include <mach/bridge-regs.h>
35	#include <plat/mvsdio.h>	35	#include <linux/platform_data/mmc-mvsdio.h>
36	#include "common.h"	36	#include "common.h"
37	#include "mpp.h"	37	#include "mpp.h"
38		38


diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index c4b64adcbfc..bd5ea6913e5 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c
@@ -26,15 +26,15 @@
26	#include <asm/mach/time.h>	26	#include <asm/mach/time.h>
27	#include <mach/kirkwood.h>	27	#include <mach/kirkwood.h>
28	#include <mach/bridge-regs.h>	28	#include <mach/bridge-regs.h>
29	#include <plat/audio.h>	29	#include <linux/platform_data/asoc-kirkwood.h>
30	#include <plat/cache-feroceon-l2.h>	30	#include <plat/cache-feroceon-l2.h>
31	#include <plat/mvsdio.h>	31	#include <linux/platform_data/mmc-mvsdio.h>
32	#include <plat/orion_nand.h>	32	#include <linux/platform_data/mtd-orion_nand.h>
33	#include <plat/ehci-orion.h>	33	#include <linux/platform_data/usb-ehci-orion.h>
34	#include <plat/common.h>	34	#include <plat/common.h>
35	#include <plat/time.h>	35	#include <plat/time.h>
36	#include <plat/addr-map.h>	36	#include <plat/addr-map.h>
37	#include <plat/mv_xor.h>	37	#include <linux/platform_data/dma-mv_xor.h>
38	#include "common.h"	38	#include "common.h"
39		39
40	/*****************************************************************************	40	/*****************************************************************************


diff --git a/arch/arm/mach-kirkwood/d2net_v2-setup.c b/arch/arm/mach-kirkwood/d2net_v2-setup.c index 6e1bac929ab..2c1a453df20 100644 --- a/arch/arm/mach-kirkwood/d2net_v2-setup.c +++ b/arch/arm/mach-kirkwood/d2net_v2-setup.c
@@ -32,7 +32,7 @@
32	#include <asm/mach-types.h>	32	#include <asm/mach-types.h>
33	#include <asm/mach/arch.h>	33	#include <asm/mach/arch.h>
34	#include <mach/kirkwood.h>	34	#include <mach/kirkwood.h>
35	#include <mach/leds-ns2.h>	35	#include <linux/platform_data/leds-kirkwood-ns2.h>
36	#include "common.h"	36	#include "common.h"
37	#include "mpp.h"	37	#include "mpp.h"
38	#include "lacie_v2-common.h"	38	#include "lacie_v2-common.h"


diff --git a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c index d9335937959..044a631ce24 100644 --- a/arch/arm/mach-kirkwood/db88f6281-bp-setup.c +++ b/arch/arm/mach-kirkwood/db88f6281-bp-setup.c
@@ -17,7 +17,7 @@
17	#include <asm/mach-types.h>	17	#include <asm/mach-types.h>
18	#include <asm/mach/arch.h>	18	#include <asm/mach/arch.h>
19	#include <mach/kirkwood.h>	19	#include <mach/kirkwood.h>
20	#include <plat/mvsdio.h>	20	#include <linux/platform_data/mmc-mvsdio.h>
21	#include "common.h"	21	#include "common.h"
22	#include "mpp.h"	22	#include "mpp.h"
23		23


diff --git a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c index 61d9a552a05..23dcb19cc2a 100644 --- a/arch/arm/mach-kirkwood/dockstar-setup.c +++ b/arch/arm/mach-kirkwood/dockstar-setup.c
@@ -19,7 +19,7 @@
19	#include <asm/mach-types.h>	19	#include <asm/mach-types.h>
20	#include <asm/mach/arch.h>	20	#include <asm/mach/arch.h>
21	#include <mach/kirkwood.h>	21	#include <mach/kirkwood.h>
22	#include <plat/mvsdio.h>	22	#include <linux/platform_data/mmc-mvsdio.h>
23	#include "common.h"	23	#include "common.h"
24	#include "mpp.h"	24	#include "mpp.h"
25		25


diff --git a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c index bdaed3867d1..7cb55f98224 100644 --- a/arch/arm/mach-kirkwood/guruplug-setup.c +++ b/arch/arm/mach-kirkwood/guruplug-setup.c
@@ -19,7 +19,7 @@
19	#include <asm/mach-types.h>	19	#include <asm/mach-types.h>
20	#include <asm/mach/arch.h>	20	#include <asm/mach/arch.h>
21	#include <mach/kirkwood.h>	21	#include <mach/kirkwood.h>
22	#include <plat/mvsdio.h>	22	#include <linux/platform_data/mmc-mvsdio.h>
23	#include "common.h"	23	#include "common.h"
24	#include "mpp.h"	24	#include "mpp.h"
25		25


diff --git a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/netspace_v2-setup.c index e6bba01bae3..88b0788baca 100644 --- a/arch/arm/mach-kirkwood/netspace_v2-setup.c +++ b/arch/arm/mach-kirkwood/netspace_v2-setup.c
@@ -34,7 +34,7 @@
34	#include <asm/mach-types.h>	34	#include <asm/mach-types.h>
35	#include <asm/mach/arch.h>	35	#include <asm/mach/arch.h>
36	#include <mach/kirkwood.h>	36	#include <mach/kirkwood.h>
37	#include <mach/leds-ns2.h>	37	#include <linux/platform_data/leds-kirkwood-ns2.h>
38	#include "common.h"	38	#include "common.h"
39	#include "mpp.h"	39	#include "mpp.h"
40	#include "lacie_v2-common.h"	40	#include "lacie_v2-common.h"


diff --git a/arch/arm/mach-kirkwood/netxbig_v2-setup.c b/arch/arm/mach-kirkwood/netxbig_v2-setup.c index 31ae8de34e9..a3b091470b8 100644 --- a/arch/arm/mach-kirkwood/netxbig_v2-setup.c +++ b/arch/arm/mach-kirkwood/netxbig_v2-setup.c
@@ -32,7 +32,7 @@
32	#include <asm/mach-types.h>	32	#include <asm/mach-types.h>
33	#include <asm/mach/arch.h>	33	#include <asm/mach/arch.h>
34	#include <mach/kirkwood.h>	34	#include <mach/kirkwood.h>
35	#include <mach/leds-netxbig.h>	35	#include <linux/platform_data/leds-kirkwood-netxbig.h>
36	#include "common.h"	36	#include "common.h"
37	#include "mpp.h"	37	#include "mpp.h"
38	#include "lacie_v2-common.h"	38	#include "lacie_v2-common.h"


diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c index 7e99c3f340f..134ef50d58f 100644 --- a/arch/arm/mach-kirkwood/openrd-setup.c +++ b/arch/arm/mach-kirkwood/openrd-setup.c
@@ -20,7 +20,7 @@
20	#include <asm/mach-types.h>	20	#include <asm/mach-types.h>
21	#include <asm/mach/arch.h>	21	#include <asm/mach/arch.h>
22	#include <mach/kirkwood.h>	22	#include <mach/kirkwood.h>
23	#include <plat/mvsdio.h>	23	#include <linux/platform_data/mmc-mvsdio.h>
24	#include "common.h"	24	#include "common.h"
25	#include "mpp.h"	25	#include "mpp.h"
26		26


diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c index ef922079348..9717101a743 100644 --- a/arch/arm/mach-kirkwood/rd88f6281-setup.c +++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c
@@ -20,7 +20,7 @@
20	#include <asm/mach-types.h>	20	#include <asm/mach-types.h>
21	#include <asm/mach/arch.h>	21	#include <asm/mach/arch.h>
22	#include <mach/kirkwood.h>	22	#include <mach/kirkwood.h>
23	#include <plat/mvsdio.h>	23	#include <linux/platform_data/mmc-mvsdio.h>
24	#include "common.h"	24	#include "common.h"
25	#include "mpp.h"	25	#include "mpp.h"
26		26


diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c index 4ea70e5f713..28d0abaf4bd 100644 --- a/arch/arm/mach-kirkwood/sheevaplug-setup.c +++ b/arch/arm/mach-kirkwood/sheevaplug-setup.c
@@ -19,7 +19,7 @@
19	#include <asm/mach-types.h>	19	#include <asm/mach-types.h>
20	#include <asm/mach/arch.h>	20	#include <asm/mach/arch.h>
21	#include <mach/kirkwood.h>	21	#include <mach/kirkwood.h>
22	#include <plat/mvsdio.h>	22	#include <linux/platform_data/mmc-mvsdio.h>
23	#include "common.h"	23	#include "common.h"
24	#include "mpp.h"	24	#include "mpp.h"
25		25


diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c index b4c53b846c9..26de7f48809 100644 --- a/arch/arm/mach-mv78xx0/common.c +++ b/arch/arm/mach-mv78xx0/common.c
@@ -20,8 +20,8 @@
20	#include <mach/mv78xx0.h>	20	#include <mach/mv78xx0.h>
21	#include <mach/bridge-regs.h>	21	#include <mach/bridge-regs.h>
22	#include <plat/cache-feroceon-l2.h>	22	#include <plat/cache-feroceon-l2.h>
23	#include <plat/ehci-orion.h>	23	#include <linux/platform_data/usb-ehci-orion.h>
24	#include <plat/orion_nand.h>	24	#include <linux/platform_data/mtd-orion_nand.h>
25	#include <plat/time.h>	25	#include <plat/time.h>
26	#include <plat/common.h>	26	#include <plat/common.h>
27	#include <plat/addr-map.h>	27	#include <plat/addr-map.h>


diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c index 9148b229d0d..ca67e825181 100644 --- a/arch/arm/mach-orion5x/common.c +++ b/arch/arm/mach-orion5x/common.c
@@ -30,8 +30,8 @@
30	#include <mach/bridge-regs.h>	30	#include <mach/bridge-regs.h>
31	#include <mach/hardware.h>	31	#include <mach/hardware.h>
32	#include <mach/orion5x.h>	32	#include <mach/orion5x.h>
33	#include <plat/orion_nand.h>	33	#include <linux/platform_data/mtd-orion_nand.h>
34	#include <plat/ehci-orion.h>	34	#include <linux/platform_data/usb-ehci-orion.h>
35	#include <plat/time.h>	35	#include <plat/time.h>
36	#include <plat/common.h>	36	#include <plat/common.h>
37	#include <plat/addr-map.h>	37	#include <plat/addr-map.h>


diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c index 49a3fd63031..41fe2b1ff47 100644 --- a/arch/arm/mach-orion5x/db88f5281-setup.c +++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -24,7 +24,7 @@
24	#include <asm/mach/arch.h>	24	#include <asm/mach/arch.h>
25	#include <asm/mach/pci.h>	25	#include <asm/mach/pci.h>
26	#include <mach/orion5x.h>	26	#include <mach/orion5x.h>
27	#include <plat/orion_nand.h>	27	#include <linux/platform_data/mtd-orion_nand.h>
28	#include "common.h"	28	#include "common.h"
29	#include "mpp.h"	29	#include "mpp.h"
30		30


diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c index 1e458efafb9..f1ae10ae5bd 100644 --- a/arch/arm/mach-orion5x/kurobox_pro-setup.c +++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -24,7 +24,7 @@
24	#include <asm/mach/arch.h>	24	#include <asm/mach/arch.h>
25	#include <asm/mach/pci.h>	25	#include <asm/mach/pci.h>
26	#include <mach/orion5x.h>	26	#include <mach/orion5x.h>
27	#include <plat/orion_nand.h>	27	#include <linux/platform_data/mtd-orion_nand.h>
28	#include "common.h"	28	#include "common.h"
29	#include "mpp.h"	29	#include "mpp.h"
30		30


diff --git a/arch/arm/plat-orion/common.c b/arch/arm/plat-orion/common.c index d245a87dc01..9148eb0fe33 100644 --- a/arch/arm/plat-orion/common.c +++ b/arch/arm/plat-orion/common.c
@@ -19,8 +19,8 @@
19	#include <linux/mv643xx_eth.h>	19	#include <linux/mv643xx_eth.h>
20	#include <linux/mv643xx_i2c.h>	20	#include <linux/mv643xx_i2c.h>
21	#include <net/dsa.h>	21	#include <net/dsa.h>
22	#include <plat/mv_xor.h>	22	#include <linux/platform_data/dma-mv_xor.h>
23	#include <plat/ehci-orion.h>	23	#include <linux/platform_data/usb-ehci-orion.h>
24	#include <mach/bridge-regs.h>	24	#include <mach/bridge-regs.h>
25		25
26	/* Create a clkdev entry for a given device/clk */	26	/* Create a clkdev entry for a given device/clk */


diff --git a/drivers/dma/mv_xor.c b/drivers/dma/mv_xor.c index 0b12e68bf79..e362e2b80ef 100644 --- a/drivers/dma/mv_xor.c +++ b/drivers/dma/mv_xor.c
@@ -26,7 +26,7 @@
26	#include <linux/platform_device.h>	26	#include <linux/platform_device.h>
27	#include <linux/memory.h>	27	#include <linux/memory.h>
28	#include <linux/clk.h>	28	#include <linux/clk.h>
29	#include <plat/mv_xor.h>	29	#include <linux/platform_data/dma-mv_xor.h>
30		30
31	#include "dmaengine.h"	31	#include "dmaengine.h"
32	#include "mv_xor.h"	32	#include "mv_xor.h"


diff --git a/drivers/leds/leds-netxbig.c b/drivers/leds/leds-netxbig.c index e37618e363c..461bbf9b33f 100644 --- a/drivers/leds/leds-netxbig.c +++ b/drivers/leds/leds-netxbig.c
@@ -28,7 +28,7 @@
28	#include <linux/platform_device.h>	28	#include <linux/platform_device.h>
29	#include <linux/gpio.h>	29	#include <linux/gpio.h>
30	#include <linux/leds.h>	30	#include <linux/leds.h>
31	#include <mach/leds-netxbig.h>	31	#include <linux/platform_data/leds-kirkwood-netxbig.h>
32		32
33	/*	33	/*
34	* GPIO extension bus.	34	* GPIO extension bus.


diff --git a/drivers/leds/leds-ns2.c b/drivers/leds/leds-ns2.c index 10528dafb04..d176ec83f5d 100644 --- a/drivers/leds/leds-ns2.c +++ b/drivers/leds/leds-ns2.c
@@ -29,7 +29,7 @@
29	#include <linux/gpio.h>	29	#include <linux/gpio.h>
30	#include <linux/leds.h>	30	#include <linux/leds.h>
31	#include <linux/module.h>	31	#include <linux/module.h>
32	#include <mach/leds-ns2.h>	32	#include <linux/platform_data/leds-kirkwood-ns2.h>
33		33
34	/*	34	/*
35	* The Network Space v2 dual-GPIO LED is wired to a CPLD and can blink in	35	* The Network Space v2 dual-GPIO LED is wired to a CPLD and can blink in


diff --git a/drivers/mmc/host/mvsdio.c b/drivers/mmc/host/mvsdio.c index a61cb5fca22..de4c20b3936 100644 --- a/drivers/mmc/host/mvsdio.c +++ b/drivers/mmc/host/mvsdio.c
@@ -25,7 +25,7 @@
25		25
26	#include <asm/sizes.h>	26	#include <asm/sizes.h>
27	#include <asm/unaligned.h>	27	#include <asm/unaligned.h>
28	#include <plat/mvsdio.h>	28	#include <linux/platform_data/mmc-mvsdio.h>
29		29
30	#include "mvsdio.h"	30	#include "mvsdio.h"
31		31


diff --git a/drivers/mtd/nand/orion_nand.c b/drivers/mtd/nand/orion_nand.c index fc5a868c436..131b58a133f 100644 --- a/drivers/mtd/nand/orion_nand.c +++ b/drivers/mtd/nand/orion_nand.c
@@ -22,7 +22,7 @@
22	#include <asm/io.h>	22	#include <asm/io.h>
23	#include <asm/sizes.h>	23	#include <asm/sizes.h>
24	#include <mach/hardware.h>	24	#include <mach/hardware.h>
25	#include <plat/orion_nand.h>	25	#include <linux/platform_data/mtd-orion_nand.h>
26		26
27	static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)	27	static void orion_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
28	{	28	{


diff --git a/drivers/usb/host/ehci-orion.c b/drivers/usb/host/ehci-orion.c index 8892d3642ce..8e7eca62f16 100644 --- a/drivers/usb/host/ehci-orion.c +++ b/drivers/usb/host/ehci-orion.c
@@ -13,7 +13,7 @@
13	#include <linux/platform_device.h>	13	#include <linux/platform_device.h>
14	#include <linux/mbus.h>	14	#include <linux/mbus.h>
15	#include <linux/clk.h>	15	#include <linux/clk.h>
16	#include <plat/ehci-orion.h>	16	#include <linux/platform_data/usb-ehci-orion.h>
17		17
18	#define rdl(off) __raw_readl(hcd->regs + (off))	18	#define rdl(off) __raw_readl(hcd->regs + (off))
19	#define wrl(off, val) __raw_writel((val), hcd->regs + (off))	19	#define wrl(off, val) __raw_writel((val), hcd->regs + (off))


diff --git a/arch/arm/plat-orion/include/plat/audio.h b/include/linux/platform_data/asoc-kirkwood.h index d6a55bd2e57..d6a55bd2e57 100644 --- a/arch/arm/plat-orion/include/plat/audio.h +++ b/include/linux/platform_data/asoc-kirkwood.h


diff --git a/arch/arm/plat-orion/include/plat/mv_xor.h b/include/linux/platform_data/dma-mv_xor.h index 2ba1f7d76ee..2ba1f7d76ee 100644 --- a/arch/arm/plat-orion/include/plat/mv_xor.h +++ b/include/linux/platform_data/dma-mv_xor.h


diff --git a/arch/arm/mach-kirkwood/include/mach/leds-netxbig.h b/include/linux/platform_data/leds-kirkwood-netxbig.h index 24b536ebdf1..24b536ebdf1 100644 --- a/arch/arm/mach-kirkwood/include/mach/leds-netxbig.h +++ b/include/linux/platform_data/leds-kirkwood-netxbig.h


diff --git a/arch/arm/mach-kirkwood/include/mach/leds-ns2.h b/include/linux/platform_data/leds-kirkwood-ns2.h index e21272e5f66..e21272e5f66 100644 --- a/arch/arm/mach-kirkwood/include/mach/leds-ns2.h +++ b/include/linux/platform_data/leds-kirkwood-ns2.h


diff --git a/arch/arm/plat-orion/include/plat/mvsdio.h b/include/linux/platform_data/mmc-mvsdio.h index 1190efedcb9..1190efedcb9 100644 --- a/arch/arm/plat-orion/include/plat/mvsdio.h +++ b/include/linux/platform_data/mmc-mvsdio.h


diff --git a/arch/arm/plat-orion/include/plat/orion_nand.h b/include/linux/platform_data/mtd-orion_nand.h index 9f3c180834d..9f3c180834d 100644 --- a/arch/arm/plat-orion/include/plat/orion_nand.h +++ b/include/linux/platform_data/mtd-orion_nand.h


diff --git a/arch/arm/plat-orion/include/plat/ehci-orion.h b/include/linux/platform_data/usb-ehci-orion.h index 6fc78e43042..6fc78e43042 100644 --- a/arch/arm/plat-orion/include/plat/ehci-orion.h +++ b/include/linux/platform_data/usb-ehci-orion.h


diff --git a/sound/soc/kirkwood/kirkwood-i2s.c b/sound/soc/kirkwood/kirkwood-i2s.c index 7646dd7f30c..542538d10ab 100644 --- a/sound/soc/kirkwood/kirkwood-i2s.c +++ b/sound/soc/kirkwood/kirkwood-i2s.c
@@ -21,7 +21,7 @@
21	#include <sound/pcm.h>	21	#include <sound/pcm.h>
22	#include <sound/pcm_params.h>	22	#include <sound/pcm_params.h>
23	#include <sound/soc.h>	23	#include <sound/soc.h>
24	#include <plat/audio.h>	24	#include <linux/platform_data/asoc-kirkwood.h>
25	#include "kirkwood.h"	25	#include "kirkwood.h"
26		26
27	#define DRV_NAME "kirkwood-i2s"	27	#define DRV_NAME "kirkwood-i2s"


diff --git a/sound/soc/kirkwood/kirkwood-openrd.c b/sound/soc/kirkwood/kirkwood-openrd.c index 80bd59c33be..c28540aeea2 100644 --- a/sound/soc/kirkwood/kirkwood-openrd.c +++ b/sound/soc/kirkwood/kirkwood-openrd.c
@@ -17,7 +17,7 @@
17	#include <linux/slab.h>	17	#include <linux/slab.h>
18	#include <sound/soc.h>	18	#include <sound/soc.h>
19	#include <mach/kirkwood.h>	19	#include <mach/kirkwood.h>
20	#include <plat/audio.h>	20	#include <linux/platform_data/asoc-kirkwood.h>
21	#include <asm/mach-types.h>	21	#include <asm/mach-types.h>
22	#include "../codecs/cs42l51.h"	22	#include "../codecs/cs42l51.h"
23		23


diff --git a/sound/soc/kirkwood/kirkwood-t5325.c b/sound/soc/kirkwood/kirkwood-t5325.c index f8983635f7e..c67bbc57498 100644 --- a/sound/soc/kirkwood/kirkwood-t5325.c +++ b/sound/soc/kirkwood/kirkwood-t5325.c
@@ -16,7 +16,7 @@
16	#include <linux/slab.h>	16	#include <linux/slab.h>
17	#include <sound/soc.h>	17	#include <sound/soc.h>
18	#include <mach/kirkwood.h>	18	#include <mach/kirkwood.h>
19	#include <plat/audio.h>	19	#include <linux/platform_data/asoc-kirkwood.h>
20	#include <asm/mach-types.h>	20	#include <asm/mach-types.h>
21	#include "../codecs/alc5623.h"	21	#include "../codecs/alc5623.h"
22		22