diff options
89 files changed, 54 insertions, 81 deletions
diff --git a/arch/arm/boards/animeo_ip/init.c b/arch/arm/boards/animeo_ip/init.c index 2069ab3764..14b33dc691 100644 --- a/arch/arm/boards/animeo_ip/init.c +++ b/arch/arm/boards/animeo_ip/init.c @@ -8,7 +8,6 @@ #include <net.h> #include <init.h> #include <environment.h> -#include <fec.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <partition.h> diff --git a/arch/arm/boards/archosg9/board.c b/arch/arm/boards/archosg9/board.c index 6f82f5ee26..52f7e86fbe 100644 --- a/arch/arm/boards/archosg9/board.c +++ b/arch/arm/boards/archosg9/board.c @@ -13,7 +13,6 @@ #include <common.h> #include <clock.h> #include <init.h> -#include <ns16550.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <mach/omap4-silicon.h> diff --git a/arch/arm/boards/at91sam9261ek/init.c b/arch/arm/boards/at91sam9261ek/init.c index 6cb170192a..b9e4914376 100644 --- a/arch/arm/boards/at91sam9261ek/init.c +++ b/arch/arm/boards/at91sam9261ek/init.c @@ -34,7 +34,7 @@ #include <mach/io.h> #include <mach/iomux.h> #include <mach/at91sam9_smc.h> -#include <dm9000.h> +#include <platform_data/eth-dm9000.h> #include <gpio_keys.h> #include <readkey.h> #include <led.h> diff --git a/arch/arm/boards/at91sam9n12ek/init.c b/arch/arm/boards/at91sam9n12ek/init.c index 26d08ae659..2ed58c1995 100644 --- a/arch/arm/boards/at91sam9n12ek/init.c +++ b/arch/arm/boards/at91sam9n12ek/init.c @@ -18,7 +18,6 @@ #include <net.h> #include <init.h> #include <environment.h> -#include <fec.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <partition.h> diff --git a/arch/arm/boards/at91sam9x5ek/init.c b/arch/arm/boards/at91sam9x5ek/init.c index e0c11a11e1..1ef35803f7 100644 --- a/arch/arm/boards/at91sam9x5ek/init.c +++ b/arch/arm/boards/at91sam9x5ek/init.c @@ -18,7 +18,6 @@ #include <net.h> #include <init.h> #include <environment.h> -#include <fec.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <partition.h> diff --git a/arch/arm/boards/beagle/board.c b/arch/arm/boards/beagle/board.c index 4ac9517dbe..460f42ac2d 100644 --- a/arch/arm/boards/beagle/board.c +++ b/arch/arm/boards/beagle/board.c @@ -23,7 +23,6 @@ #include <io.h> #include <bbu.h> #include <filetype.h> -#include <ns16550.h> #include <envfs.h> #include <asm/armlinux.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/ccxmx51/ccxmx51.c b/arch/arm/boards/ccxmx51/ccxmx51.c index 40cf76dc5a..71a51e1927 100644 --- a/arch/arm/boards/ccxmx51/ccxmx51.c +++ b/arch/arm/boards/ccxmx51/ccxmx51.c @@ -20,7 +20,7 @@ #include <init.h> #include <environment.h> #include <mach/imx51-regs.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <partition.h> diff --git a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c index 6e83570c55..947db7cff6 100644 --- a/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c +++ b/arch/arm/boards/crystalfontz-cfa10036/cfa10036.c @@ -19,7 +19,6 @@ #include <environment.h> #include <envfs.h> #include <errno.h> -#include <fec.h> #include <gpio.h> #include <init.h> #include <mci.h> diff --git a/arch/arm/boards/datamodul-edm-qmx6/board.c b/arch/arm/boards/datamodul-edm-qmx6/board.c index 96c7fbe4bf..043a93461b 100644 --- a/arch/arm/boards/datamodul-edm-qmx6/board.c +++ b/arch/arm/boards/datamodul-edm-qmx6/board.c @@ -26,7 +26,6 @@ #include <linux/sizes.h> #include <init.h> #include <gpio.h> -#include <fec.h> #include <of.h> #include <linux/micrel_phy.h> diff --git a/arch/arm/boards/dss11/init.c b/arch/arm/boards/dss11/init.c index feca909c27..321c383ffc 100644 --- a/arch/arm/boards/dss11/init.c +++ b/arch/arm/boards/dss11/init.c @@ -17,7 +17,6 @@ #include <mci.h> #include <init.h> #include <environment.h> -#include <fec.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <partition.h> diff --git a/arch/arm/boards/edb93xx/edb93xx.c b/arch/arm/boards/edb93xx/edb93xx.c index 3b8e668e35..99c69548bd 100644 --- a/arch/arm/boards/edb93xx/edb93xx.c +++ b/arch/arm/boards/edb93xx/edb93xx.c @@ -27,7 +27,7 @@ #include <malloc.h> #include <generated/mach-types.h> #include <mach/ep93xx-regs.h> -#include <net/ep93xx_eth.h> +#include <platform_data/eth-ep93xx.h> #include "edb93xx.h" #define DEVCFG_U1EN (1 << 18) diff --git a/arch/arm/boards/embedsky-e9/board.c b/arch/arm/boards/embedsky-e9/board.c index 251bfee65b..0f47677bb0 100644 --- a/arch/arm/boards/embedsky-e9/board.c +++ b/arch/arm/boards/embedsky-e9/board.c @@ -22,7 +22,6 @@ #include <init.h> #include <environment.h> #include <mach/imx6-regs.h> -#include <fec.h> #include <gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c index 22bf7409a2..90451911e4 100644 --- a/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c +++ b/arch/arm/boards/eukrea_cpuimx25/eukrea_cpuimx25.c @@ -36,7 +36,7 @@ #include <mach/imx-nand.h> #include <mach/imxfb.h> #include <mach/iim.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <nand.h> #include <mach/iomux-mx25.h> #include <i2c/i2c.h> diff --git a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c index 31422e64a0..07fee0599e 100644 --- a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c +++ b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c @@ -22,7 +22,6 @@ #include <init.h> #include <environment.h> #include <mach/imx27-regs.h> -#include <fec.h> #include <notifier.h> #include <gpio.h> #include <asm/armlinux.h> @@ -39,7 +38,7 @@ #include <mach/imx-pll.h> #include <mach/weim.h> #include <mach/imxfb.h> -#include <ns16550.h> +#include <platform_data/serial-ns16550.h> #include <asm/mmu.h> #include <i2c/i2c.h> #include <mfd/lp3972.h> diff --git a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c index 7b3993d506..9c4ea13d8e 100644 --- a/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c +++ b/arch/arm/boards/eukrea_cpuimx35/eukrea_cpuimx35.c @@ -27,7 +27,7 @@ #include <environment.h> #include <errno.h> #include <fcntl.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <fs.h> #include <init.h> #include <nand.h> diff --git a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c b/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c index 75f325001b..fc57f6c157 100644 --- a/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c +++ b/arch/arm/boards/eukrea_cpuimx51/eukrea_cpuimx51.c @@ -20,7 +20,7 @@ #include <init.h> #include <environment.h> #include <mach/imx51-regs.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/freescale-mx25-3ds/3stack.c b/arch/arm/boards/freescale-mx25-3ds/3stack.c index 6d0e38205a..36ad591cc0 100644 --- a/arch/arm/boards/freescale-mx25-3ds/3stack.c +++ b/arch/arm/boards/freescale-mx25-3ds/3stack.c @@ -30,7 +30,7 @@ #include <partition.h> #include <generated/mach-types.h> #include <mach/imx-nand.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <nand.h> #include <mach/iomux-mx25.h> #include <mach/generic.h> diff --git a/arch/arm/boards/freescale-mx27-ads/imx27ads.c b/arch/arm/boards/freescale-mx27-ads/imx27ads.c index 9fb1760602..109f7f9cca 100644 --- a/arch/arm/boards/freescale-mx27-ads/imx27ads.c +++ b/arch/arm/boards/freescale-mx27-ads/imx27ads.c @@ -21,7 +21,7 @@ #include <mach/imx27-regs.h> #include <asm/armlinux.h> #include <io.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <gpio.h> #include <mach/weim.h> #include <partition.h> diff --git a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c index fc1237588f..9e5d612bda 100644 --- a/arch/arm/boards/freescale-mx28-evk/mx28-evk.c +++ b/arch/arm/boards/freescale-mx28-evk/mx28-evk.c @@ -17,7 +17,7 @@ #include <common.h> #include <environment.h> #include <errno.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <gpio.h> #include <init.h> #include <mci.h> diff --git a/arch/arm/boards/freescale-mx35-3ds/3stack.c b/arch/arm/boards/freescale-mx35-3ds/3stack.c index cca0fe49eb..caeb3f75e8 100644 --- a/arch/arm/boards/freescale-mx35-3ds/3stack.c +++ b/arch/arm/boards/freescale-mx35-3ds/3stack.c @@ -25,7 +25,7 @@ #include <environment.h> #include <errno.h> #include <fcntl.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <fs.h> #include <init.h> #include <nand.h> diff --git a/arch/arm/boards/freescale-mx51-babbage/board.c b/arch/arm/boards/freescale-mx51-babbage/board.c index c4acb8ee16..915748528d 100644 --- a/arch/arm/boards/freescale-mx51-babbage/board.c +++ b/arch/arm/boards/freescale-mx51-babbage/board.c @@ -20,7 +20,6 @@ #include <init.h> #include <environment.h> #include <mach/imx51-regs.h> -#include <fec.h> #include <gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/freescale-mx53-smd/board.c b/arch/arm/boards/freescale-mx53-smd/board.c index 196d20a45d..354702dea1 100644 --- a/arch/arm/boards/freescale-mx53-smd/board.c +++ b/arch/arm/boards/freescale-mx53-smd/board.c @@ -17,7 +17,7 @@ #include <common.h> #include <environment.h> #include <fcntl.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <fs.h> #include <init.h> #include <nand.h> diff --git a/arch/arm/boards/freescale-mx6-sabrelite/board.c b/arch/arm/boards/freescale-mx6-sabrelite/board.c index d40f99bb93..63fa58886c 100644 --- a/arch/arm/boards/freescale-mx6-sabrelite/board.c +++ b/arch/arm/boards/freescale-mx6-sabrelite/board.c @@ -18,7 +18,6 @@ #include <init.h> #include <environment.h> #include <mach/imx6-regs.h> -#include <fec.h> #include <gpio.h> #include <mach/bbu.h> #include <asm/armlinux.h> diff --git a/arch/arm/boards/freescale-mx6-sabresd/board.c b/arch/arm/boards/freescale-mx6-sabresd/board.c index 734adde070..595b1eae0b 100644 --- a/arch/arm/boards/freescale-mx6-sabresd/board.c +++ b/arch/arm/boards/freescale-mx6-sabresd/board.c @@ -19,7 +19,6 @@ #include <init.h> #include <environment.h> #include <mach/imx6-regs.h> -#include <fec.h> #include <gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/friendlyarm-mini2440/mini2440.c b/arch/arm/boards/friendlyarm-mini2440/mini2440.c index b59c8367f3..7f59cb99b2 100644 --- a/arch/arm/boards/friendlyarm-mini2440/mini2440.c +++ b/arch/arm/boards/friendlyarm-mini2440/mini2440.c @@ -21,7 +21,7 @@ #include <init.h> #include <generated/mach-types.h> #include <partition.h> -#include <dm9000.h> +#include <platform_data/eth-dm9000.h> #include <nand.h> #include <mci.h> #include <fb.h> diff --git a/arch/arm/boards/friendlyarm-mini6410/mini6410.c b/arch/arm/boards/friendlyarm-mini6410/mini6410.c index a372db5471..a85b1bd920 100644 --- a/arch/arm/boards/friendlyarm-mini6410/mini6410.c +++ b/arch/arm/boards/friendlyarm-mini6410/mini6410.c @@ -14,7 +14,7 @@ #include <common.h> #include <driver.h> #include <init.h> -#include <dm9000.h> +#include <platform_data/eth-dm9000.h> #include <gpio.h> #include <generated/mach-types.h> #include <asm/armlinux.h> diff --git a/arch/arm/boards/friendlyarm-tiny210/tiny210.c b/arch/arm/boards/friendlyarm-tiny210/tiny210.c index d84b3128ad..b40dc98c5b 100644 --- a/arch/arm/boards/friendlyarm-tiny210/tiny210.c +++ b/arch/arm/boards/friendlyarm-tiny210/tiny210.c @@ -29,7 +29,6 @@ #include <init.h> #include <linux/sizes.h> #include <generated/mach-types.h> -#include <dm9000.h> #include <gpio.h> #include <led.h> #include <io.h> diff --git a/arch/arm/boards/friendlyarm-tiny6410/development-board.c b/arch/arm/boards/friendlyarm-tiny6410/development-board.c index 773a423ea0..5dd05e4cc8 100644 --- a/arch/arm/boards/friendlyarm-tiny6410/development-board.c +++ b/arch/arm/boards/friendlyarm-tiny6410/development-board.c @@ -23,7 +23,7 @@ #include <driver.h> #include <init.h> #include <gpio.h> -#include <dm9000.h> +#include <platform_data/eth-dm9000.h> #include <mach/devices-s3c64xx.h> #include <mach/s3c-generic.h> #include <mach/iomux.h> diff --git a/arch/arm/boards/guf-cupid/board.c b/arch/arm/boards/guf-cupid/board.c index 90f16272fd..6ec74eb49b 100644 --- a/arch/arm/boards/guf-cupid/board.c +++ b/arch/arm/boards/guf-cupid/board.c @@ -33,7 +33,7 @@ #include <nand.h> #include <generated/mach-types.h> #include <mach/imx-nand.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <fb.h> #include <asm/mmu.h> #include <mach/weim.h> diff --git a/arch/arm/boards/guf-neso/board.c b/arch/arm/boards/guf-neso/board.c index f40f0d1591..176d77e7b3 100644 --- a/arch/arm/boards/guf-neso/board.c +++ b/arch/arm/boards/guf-neso/board.c @@ -18,7 +18,7 @@ #include <net.h> #include <init.h> #include <environment.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <notifier.h> #include <partition.h> #include <gpio.h> diff --git a/arch/arm/boards/karo-tx28/tx28-stk5.c b/arch/arm/boards/karo-tx28/tx28-stk5.c index d67607b717..ec0826297b 100644 --- a/arch/arm/boards/karo-tx28/tx28-stk5.c +++ b/arch/arm/boards/karo-tx28/tx28-stk5.c @@ -18,7 +18,7 @@ #include <environment.h> #include <errno.h> #include <mci.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <linux/sizes.h> #include <io.h> #include <net.h> diff --git a/arch/arm/boards/karo-tx51/tx51.c b/arch/arm/boards/karo-tx51/tx51.c index f5ebe46a2b..913df68cc9 100644 --- a/arch/arm/boards/karo-tx51/tx51.c +++ b/arch/arm/boards/karo-tx51/tx51.c @@ -19,7 +19,7 @@ #include <init.h> #include <environment.h> #include <mach/imx51-regs.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/karo-tx53/board.c b/arch/arm/boards/karo-tx53/board.c index 9e65a839ad..99aa9e74f5 100644 --- a/arch/arm/boards/karo-tx53/board.c +++ b/arch/arm/boards/karo-tx53/board.c @@ -16,7 +16,7 @@ #include <bootsource.h> #include <environment.h> #include <fcntl.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <fs.h> #include <init.h> #include <nand.h> diff --git a/arch/arm/boards/lubbock/board.c b/arch/arm/boards/lubbock/board.c index 6f517d8926..c2a0db7bd8 100644 --- a/arch/arm/boards/lubbock/board.c +++ b/arch/arm/boards/lubbock/board.c @@ -33,7 +33,7 @@ #include <mach/udc_pxa2xx.h> #include <mach/mci_pxa2xx.h> -#include <net/smc91111.h> +#include <platform_data/eth-smc91111.h> #include <asm/armlinux.h> #include <asm/io.h> #include <asm/mmu.h> diff --git a/arch/arm/boards/mainstone/board.c b/arch/arm/boards/mainstone/board.c index c339bb9315..0e48e79967 100644 --- a/arch/arm/boards/mainstone/board.c +++ b/arch/arm/boards/mainstone/board.c @@ -33,7 +33,7 @@ #include <mach/udc_pxa2xx.h> #include <mach/mci_pxa2xx.h> -#include <net/smc91111.h> +#include <platform_data/eth-smc91111.h> #include <asm/armlinux.h> #include <asm/io.h> #include <asm/mmu.h> diff --git a/arch/arm/boards/mmccpu/init.c b/arch/arm/boards/mmccpu/init.c index 8979b818b0..747c4b2742 100644 --- a/arch/arm/boards/mmccpu/init.c +++ b/arch/arm/boards/mmccpu/init.c @@ -18,7 +18,6 @@ #include <net.h> #include <init.h> #include <environment.h> -#include <fec.h> #include <gpio.h> #include <asm/armlinux.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/omap343xdsp/board.c b/arch/arm/boards/omap343xdsp/board.c index 1b1cb79212..2fd0dee194 100644 --- a/arch/arm/boards/omap343xdsp/board.c +++ b/arch/arm/boards/omap343xdsp/board.c @@ -20,7 +20,6 @@ #include <init.h> #include <driver.h> #include <io.h> -#include <ns16550.h> #include <asm/armlinux.h> #include <mach/omap3-silicon.h> #include <mach/omap3-devices.h> diff --git a/arch/arm/boards/omap3evm/board.c b/arch/arm/boards/omap3evm/board.c index 0fe69b61a7..eefb540fc1 100644 --- a/arch/arm/boards/omap3evm/board.c +++ b/arch/arm/boards/omap3evm/board.c @@ -44,7 +44,6 @@ #include <driver.h> #include <io.h> #include <linux/sizes.h> -#include <ns16550.h> #include <asm/armlinux.h> #include <mach/omap3-silicon.h> #include <mach/omap3-mux.h> diff --git a/arch/arm/boards/panda/board.c b/arch/arm/boards/panda/board.c index f7a3a0fa28..acba689623 100644 --- a/arch/arm/boards/panda/board.c +++ b/arch/arm/boards/panda/board.c @@ -4,7 +4,6 @@ #include <driver.h> #include <io.h> #include <gpio.h> -#include <ns16550.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <mach/omap4-silicon.h> diff --git a/arch/arm/boards/phytec-phycard-imx27/pca100.c b/arch/arm/boards/phytec-phycard-imx27/pca100.c index 0481113c65..895fae8a06 100644 --- a/arch/arm/boards/phytec-phycard-imx27/pca100.c +++ b/arch/arm/boards/phytec-phycard-imx27/pca100.c @@ -19,7 +19,6 @@ #include <init.h> #include <environment.h> #include <mach/imx27-regs.h> -#include <fec.h> #include <gpio.h> #include <linux/sizes.h> #include <asm/armlinux.h> diff --git a/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c index 1c2e7f7429..930f3b9c7c 100644 --- a/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c +++ b/arch/arm/boards/phytec-phycard-omap3/pca-a-l1.c @@ -44,7 +44,6 @@ #include <errno.h> #include <init.h> #include <nand.h> -#include <ns16550.h> #include <partition.h> #include <linux/sizes.h> #include <asm/armlinux.h> diff --git a/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c b/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c index 78890ba5a9..c0e4448a00 100644 --- a/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c +++ b/arch/arm/boards/phytec-phycard-omap4/pca-a-xl2.c @@ -20,7 +20,6 @@ #include <driver.h> #include <io.h> #include <gpio.h> -#include <ns16550.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <mach/omap4-silicon.h> diff --git a/arch/arm/boards/phytec-phycore-imx27/pcm970.c b/arch/arm/boards/phytec-phycore-imx27/pcm970.c index 73df2ad2a8..13bb7c1cf5 100644 --- a/arch/arm/boards/phytec-phycore-imx27/pcm970.c +++ b/arch/arm/boards/phytec-phycore-imx27/pcm970.c @@ -15,7 +15,7 @@ #include <gpio.h> #include <init.h> #include <io.h> -#include <platform_ide.h> +#include <platform_data/ide.h> #include <linux/sizes.h> #include <mach/imx27-regs.h> #include <mach/iomux-mx27.h> diff --git a/arch/arm/boards/phytec-phycore-imx31/pcm037.c b/arch/arm/boards/phytec-phycore-imx31/pcm037.c index a1ffb2e73e..39e7838be0 100644 --- a/arch/arm/boards/phytec-phycore-imx31/pcm037.c +++ b/arch/arm/boards/phytec-phycore-imx31/pcm037.c @@ -31,7 +31,7 @@ #include <asm/sections.h> #include <mach/weim.h> #include <io.h> -#include <smc911x.h> +#include <platform_data/eth-smc911x.h> #include <asm/mmu.h> #include <partition.h> #include <generated/mach-types.h> diff --git a/arch/arm/boards/phytec-phycore-imx35/pcm043.c b/arch/arm/boards/phytec-phycore-imx35/pcm043.c index e31c79d15f..b83698b90a 100644 --- a/arch/arm/boards/phytec-phycore-imx35/pcm043.c +++ b/arch/arm/boards/phytec-phycore-imx35/pcm043.c @@ -34,7 +34,6 @@ #include <nand.h> #include <generated/mach-types.h> #include <mach/imx-nand.h> -#include <fec.h> #include <fb.h> #include <led.h> #include <bootsource.h> diff --git a/arch/arm/boards/phytec-phycore-omap4460/board.c b/arch/arm/boards/phytec-phycore-omap4460/board.c index 6495a6f6ab..807cdd677d 100644 --- a/arch/arm/boards/phytec-phycore-omap4460/board.c +++ b/arch/arm/boards/phytec-phycore-omap4460/board.c @@ -20,7 +20,6 @@ #include <driver.h> #include <gpio.h> #include <io.h> -#include <ns16550.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <mach/omap4-silicon.h> diff --git a/arch/arm/boards/phytec-som-imx6/board.c b/arch/arm/boards/phytec-som-imx6/board.c index fe237942f8..930ad74d74 100644 --- a/arch/arm/boards/phytec-som-imx6/board.c +++ b/arch/arm/boards/phytec-som-imx6/board.c @@ -29,7 +29,8 @@ #include <init.h> #include <of.h> #include <mach/bbu.h> -#include <fec.h> +#include <platform_data/eth-fec.h> + #include <globalvar.h> #include <linux/micrel_phy.h> diff --git a/arch/arm/boards/pm9261/init.c b/arch/arm/boards/pm9261/init.c index 63f4f19b3f..177355b633 100644 --- a/arch/arm/boards/pm9261/init.c +++ b/arch/arm/boards/pm9261/init.c @@ -35,7 +35,7 @@ #include <mach/iomux.h> #include <mach/io.h> #include <mach/at91sam9_smc.h> -#include <dm9000.h> +#include <platform_data/eth-dm9000.h> #include <linux/w1-gpio.h> #include <w1_mac_address.h> diff --git a/arch/arm/boards/pm9263/init.c b/arch/arm/boards/pm9263/init.c index 2b6b0891f5..e9f8588649 100644 --- a/arch/arm/boards/pm9263/init.c +++ b/arch/arm/boards/pm9263/init.c @@ -20,7 +20,6 @@ #include <net.h> #include <init.h> #include <environment.h> -#include <fec.h> #include <asm/armlinux.h> #include <generated/mach-types.h> #include <partition.h> diff --git a/arch/arm/boards/scb9328/scb9328.c b/arch/arm/boards/scb9328/scb9328.c index 3af140423f..fda3b1432c 100644 --- a/arch/arm/boards/scb9328/scb9328.c +++ b/arch/arm/boards/scb9328/scb9328.c @@ -26,7 +26,7 @@ #include <partition.h> #include <fs.h> #include <fcntl.h> -#include <dm9000.h> +#include <platform_data/eth-dm9000.h> #include <led.h> #include <mach/iomux-mx1.h> #include <mach/devices-imx1.h> diff --git a/arch/arm/boards/tqma6x/board.c b/arch/arm/boards/tqma6x/board.c index 9c52c8ae7a..8946a27b69 100644 --- a/arch/arm/boards/tqma6x/board.c +++ b/arch/arm/boards/tqma6x/board.c @@ -26,7 +26,6 @@ #include <linux/sizes.h> #include <init.h> #include <gpio.h> -#include <fec.h> #include <of.h> #include <linux/micrel_phy.h> diff --git a/arch/arm/boards/udoo/board.c b/arch/arm/boards/udoo/board.c index f3668fef0b..f0befaf3a9 100644 --- a/arch/arm/boards/udoo/board.c +++ b/arch/arm/boards/udoo/board.c @@ -19,7 +19,6 @@ #include <init.h> #include <environment.h> #include <mach/imx6-regs.h> -#include <fec.h> #include <gpio.h> #include <mach/bbu.h> #include <asm/armlinux.h> diff --git a/arch/arm/boards/versatile/versatilepb.c b/arch/arm/boards/versatile/versatilepb.c index 3166cd4fed..8691a171e1 100644 --- a/arch/arm/boards/versatile/versatilepb.c +++ b/arch/arm/boards/versatile/versatilepb.c @@ -29,7 +29,7 @@ #include <environment.h> #include <partition.h> #include <linux/sizes.h> -#include <net/smc91111.h> +#include <platform_data/eth-smc91111.h> static int vpb_console_init(void) { diff --git a/arch/arm/boards/zylonite/board.c b/arch/arm/boards/zylonite/board.c index 2ff08b7934..bd72cd1992 100644 --- a/arch/arm/boards/zylonite/board.c +++ b/arch/arm/boards/zylonite/board.c @@ -25,7 +25,7 @@ #include <init.h> #include <partition.h> #include <led.h> -#include <net/smc91111.h> +#include <platform_data/eth-smc91111.h> #include <platform_data/mtd-nand-mrvl.h> #include <pwm.h> #include <linux/clk.h> diff --git a/arch/arm/mach-imx/include/mach/devices.h b/arch/arm/mach-imx/include/mach/devices.h index 45bb0a51ee..6a045dd070 100644 --- a/arch/arm/mach-imx/include/mach/devices.h +++ b/arch/arm/mach-imx/include/mach/devices.h @@ -1,5 +1,5 @@ -#include <fec.h> +#include <platform_data/eth-fec.h> #include <input/matrix_keypad.h> #include <i2c/i2c.h> #include <mach/spi.h> diff --git a/arch/arm/mach-omap/omap_devices.c b/arch/arm/mach-omap/omap_devices.c index 9ed3dcf619..f577fa6ea7 100644 --- a/arch/arm/mach-omap/omap_devices.c +++ b/arch/arm/mach-omap/omap_devices.c @@ -1,5 +1,5 @@ #include <driver.h> -#include <ns16550.h> +#include <platform_data/serial-ns16550.h> #include <asm/armlinux.h> #include <mach/omap3-devices.h> diff --git a/arch/arm/mach-socfpga/generic.c b/arch/arm/mach-socfpga/generic.c index 906bc63330..c920bd658f 100644 --- a/arch/arm/mach-socfpga/generic.c +++ b/arch/arm/mach-socfpga/generic.c @@ -4,7 +4,6 @@ #include <init.h> #include <io.h> #include <fs.h> -#include <net/designware.h> #include <linux/clkdev.h> #include <linux/clk.h> #include <linux/stat.h> diff --git a/arch/arm/mach-socfpga/xload.c b/arch/arm/mach-socfpga/xload.c index fd0d777add..7f8f0320ca 100644 --- a/arch/arm/mach-socfpga/xload.c +++ b/arch/arm/mach-socfpga/xload.c @@ -2,7 +2,7 @@ #include <platform_data/dw_mmc.h> #include <bootsource.h> #include <bootstrap.h> -#include <ns16550.h> +#include <platform_data/serial-ns16550.h> #include <common.h> #include <malloc.h> #include <init.h> diff --git a/arch/arm/mach-tegra/tegra20.c b/arch/arm/mach-tegra/tegra20.c index 8d1cd5b2fb..10c149a955 100644 --- a/arch/arm/mach-tegra/tegra20.c +++ b/arch/arm/mach-tegra/tegra20.c @@ -16,7 +16,6 @@ #include <common.h> #include <init.h> -#include <ns16550.h> #include <asm/memory.h> #include <mach/iomap.h> #include <mach/lowlevel.h> diff --git a/arch/blackfin/boards/ipe337/ipe337.c b/arch/blackfin/boards/ipe337/ipe337.c index 84cc786f85..604062a54b 100644 --- a/arch/blackfin/boards/ipe337/ipe337.c +++ b/arch/blackfin/boards/ipe337/ipe337.c @@ -4,7 +4,7 @@ #include <asm/cpu/cdefBF561.h> #include <partition.h> #include <fs.h> -#include <smc911x.h> +#include <platform_data/eth-smc911x.h> struct smc911x_plat smcplat = { .shift = 1, diff --git a/arch/efi/efi/efi.c b/arch/efi/efi/efi.c index 9c270a597e..36ac016a91 100644 --- a/arch/efi/efi/efi.c +++ b/arch/efi/efi/efi.c @@ -26,7 +26,7 @@ #include <init.h> #include <restart.h> #include <driver.h> -#include <ns16550.h> +#include <platform_data/serial-ns16550.h> #include <io.h> #include <efi.h> #include <malloc.h> diff --git a/arch/mips/mach-ar231x/ar231x.c b/arch/mips/mach-ar231x/ar231x.c index f714a11e92..3a0103b5ce 100644 --- a/arch/mips/mach-ar231x/ar231x.c +++ b/arch/mips/mach-ar231x/ar231x.c @@ -16,7 +16,7 @@ #include <common.h> #include <init.h> #include <io.h> -#include <ns16550.h> +#include <platform_data/serial-ns16550.h> #include <mach/ar231x_platform.h> #include <mach/ar2312_regs.h> diff --git a/arch/ppc/boards/freescale-p1010rdb/p1010rdb.c b/arch/ppc/boards/freescale-p1010rdb/p1010rdb.c index 60cae46d25..eab3abac70 100644 --- a/arch/ppc/boards/freescale-p1010rdb/p1010rdb.c +++ b/arch/ppc/boards/freescale-p1010rdb/p1010rdb.c @@ -17,7 +17,7 @@ #include <common.h> #include <init.h> #include <driver.h> -#include <ns16550.h> +#include <platform_data/serial-ns16550.h> #include <net.h> #include <types.h> #include <i2c/i2c.h> diff --git a/arch/ppc/boards/freescale-p1022ds/p1022ds.c b/arch/ppc/boards/freescale-p1022ds/p1022ds.c index 57e7953fb1..95a7234d4b 100644 --- a/arch/ppc/boards/freescale-p1022ds/p1022ds.c +++ b/arch/ppc/boards/freescale-p1022ds/p1022ds.c @@ -17,7 +17,7 @@ #include <common.h> #include <init.h> #include <driver.h> -#include <ns16550.h> +#include <platform_data/serial-ns16550.h> #include <net.h> #include <types.h> #include <i2c/i2c.h> diff --git a/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c b/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c index 385a436459..b03d791eb1 100644 --- a/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c +++ b/arch/ppc/boards/freescale-p2020rdb/p2020rdb.c @@ -20,7 +20,7 @@ #include <common.h> #include <init.h> #include <driver.h> -#include <ns16550.h> +#include <platform_data/serial-ns16550.h> #include <types.h> #include <i2c/i2c.h> #include <partition.h> diff --git a/arch/ppc/boards/geip-da923rc/da923rc.c b/arch/ppc/boards/geip-da923rc/da923rc.c index b6b5d56acd..85c974780d 100644 --- a/arch/ppc/boards/geip-da923rc/da923rc.c +++ b/arch/ppc/boards/geip-da923rc/da923rc.c @@ -22,7 +22,7 @@ #include <asm/io.h> #include <net.h> #include <gpio.h> -#include <ns16550.h> +#include <platform_data/serial-ns16550.h> #include <partition.h> #include <environment.h> #include <i2c/i2c.h> diff --git a/arch/ppc/boards/pcm030/pcm030.c b/arch/ppc/boards/pcm030/pcm030.c index 11b3beb20f..05c1ce9ca8 100644 --- a/arch/ppc/boards/pcm030/pcm030.c +++ b/arch/ppc/boards/pcm030/pcm030.c @@ -26,7 +26,7 @@ #include <common.h> #include <driver.h> #include <init.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <types.h> #include <partition.h> #include <memory.h> diff --git a/arch/x86/boards/x86_generic/intf_platform_ide.c b/arch/x86/boards/x86_generic/intf_platform_ide.c index 18a2620ce0..528e721d56 100644 --- a/arch/x86/boards/x86_generic/intf_platform_ide.c +++ b/arch/x86/boards/x86_generic/intf_platform_ide.c @@ -24,7 +24,7 @@ #include <driver.h> #include <init.h> #include <linux/err.h> -#include <platform_ide.h> +#include <platform_data/ide.h> #include "envsector.h" static struct ide_port_info ide_plat = { diff --git a/arch/x86/boards/x86_generic/serial_ns16550.c b/arch/x86/boards/x86_generic/serial_ns16550.c index 3b284f3d3d..abc1047a50 100644 --- a/arch/x86/boards/x86_generic/serial_ns16550.c +++ b/arch/x86/boards/x86_generic/serial_ns16550.c @@ -25,7 +25,7 @@ #include <driver.h> #include <init.h> #include <asm/syslib.h> -#include <ns16550.h> +#include <platform_data/serial-ns16550.h> #include <linux/err.h> static struct NS16550_plat serial_plat = { diff --git a/drivers/ata/intf_platform_ide.c b/drivers/ata/intf_platform_ide.c index 6e74bfb089..c3af0833ba 100644 --- a/drivers/ata/intf_platform_ide.c +++ b/drivers/ata/intf_platform_ide.c @@ -27,7 +27,7 @@ #include <malloc.h> #include <errno.h> #include <ata_drive.h> -#include <platform_ide.h> +#include <platform_data/ide.h> #include <linux/err.h> #include <of.h> diff --git a/drivers/ata/pata-imx.c b/drivers/ata/pata-imx.c index 842957331e..c8098a537f 100644 --- a/drivers/ata/pata-imx.c +++ b/drivers/ata/pata-imx.c @@ -28,7 +28,7 @@ #include <malloc.h> #include <errno.h> #include <ata_drive.h> -#include <platform_ide.h> +#include <platform_data/ide.h> #include <io.h> #include <of.h> #include <linux/err.h> diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 3dc4b16b67..75a917a76d 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -49,7 +49,7 @@ #include <asm/system.h> #include <linux/phy.h> #include <mach/emac_defs.h> -#include <net/davinci_emac.h> +#include <platform_data/eth-davinci-emac.h> #include "davinci_emac.h" struct davinci_emac_priv { diff --git a/drivers/net/designware.c b/drivers/net/designware.c index 3b21244478..1d662a71d9 100644 --- a/drivers/net/designware.c +++ b/drivers/net/designware.c @@ -27,7 +27,7 @@ #include <io.h> #include <net.h> #include <of_net.h> -#include <net/designware.h> +#include <platform_data/eth-designware.h> #include <linux/phy.h> #include <linux/err.h> #include "designware.h" diff --git a/drivers/net/dm9k.c b/drivers/net/dm9k.c index ad402e3efc..acc0abbc48 100644 --- a/drivers/net/dm9k.c +++ b/drivers/net/dm9k.c @@ -29,7 +29,7 @@ #include <net.h> #include <io.h> #include <xfuncs.h> -#include <dm9000.h> +#include <platform_data/eth-dm9000.h> #include <errno.h> #include <linux/phy.h> diff --git a/drivers/net/ep93xx.c b/drivers/net/ep93xx.c index 0acb9b692f..fd725a56ee 100644 --- a/drivers/net/ep93xx.c +++ b/drivers/net/ep93xx.c @@ -38,7 +38,7 @@ #include <linux/types.h> #include <mach/ep93xx-regs.h> #include <linux/phy.h> -#include <net/ep93xx_eth.h> +#include <platform_data/eth-ep93xx.h> #include "ep93xx.h" #define EP93XX_MAX_PKT_SIZE 1536 diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c index 83fdec66d7..8bc7c2993a 100644 --- a/drivers/net/fec_imx.c +++ b/drivers/net/fec_imx.c @@ -20,7 +20,7 @@ #include <net.h> #include <init.h> #include <driver.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <io.h> #include <clock.h> #include <xfuncs.h> diff --git a/drivers/net/fec_mpc5200.c b/drivers/net/fec_mpc5200.c index bb57c34502..b99c23f7d4 100644 --- a/drivers/net/fec_mpc5200.c +++ b/drivers/net/fec_mpc5200.c @@ -10,7 +10,7 @@ #include <mach/mpc5xxx.h> #include <malloc.h> #include <net.h> -#include <fec.h> +#include <platform_data/eth-fec.h> #include <init.h> #include <driver.h> #include <mach/sdma.h> diff --git a/drivers/net/smc91111.c b/drivers/net/smc91111.c index b7055910eb..e08e3dd1b5 100644 --- a/drivers/net/smc91111.c +++ b/drivers/net/smc91111.c @@ -67,7 +67,7 @@ #include <io.h> #include <linux/phy.h> #include <linux/err.h> -#include <net/smc91111.h> +#include <platform_data/eth-smc91111.h> /*--------------------------------------------------------------- . diff --git a/drivers/net/smc911x.c b/drivers/net/smc911x.c index 9b1a38ae21..fe9d1df502 100644 --- a/drivers/net/smc911x.c +++ b/drivers/net/smc911x.c @@ -28,7 +28,7 @@ #include <errno.h> #include <clock.h> #include <io.h> -#include <smc911x.h> +#include <platform_data/eth-smc911x.h> #include <linux/phy.h> #include "smc911x.h" diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c index 4ad52ea79c..c6548e3b85 100644 --- a/drivers/serial/serial_ns16550.c +++ b/drivers/serial/serial_ns16550.c @@ -41,7 +41,7 @@ #include <linux/clk.h> #include "serial_ns16550.h" -#include <ns16550.h> +#include <platform_data/serial-ns16550.h> struct ns16550_priv { struct console_device cdev; diff --git a/include/net/davinci_emac.h b/include/platform_data/eth-davinci-emac.h index caead1fecf..caead1fecf 100644 --- a/include/net/davinci_emac.h +++ b/include/platform_data/eth-davinci-emac.h diff --git a/include/net/designware.h b/include/platform_data/eth-designware.h index 7a7a26abfd..7a7a26abfd 100644 --- a/include/net/designware.h +++ b/include/platform_data/eth-designware.h diff --git a/include/dm9000.h b/include/platform_data/eth-dm9000.h index a9a4635d2a..a9a4635d2a 100644 --- a/include/dm9000.h +++ b/include/platform_data/eth-dm9000.h diff --git a/include/net/ep93xx_eth.h b/include/platform_data/eth-ep93xx.h index 0fb11d0acd..0fb11d0acd 100644 --- a/include/net/ep93xx_eth.h +++ b/include/platform_data/eth-ep93xx.h diff --git a/include/fec.h b/include/platform_data/eth-fec.h index 699761a998..699761a998 100644 --- a/include/fec.h +++ b/include/platform_data/eth-fec.h diff --git a/include/net/smc91111.h b/include/platform_data/eth-smc91111.h index 72193bf972..72193bf972 100644 --- a/include/net/smc91111.h +++ b/include/platform_data/eth-smc91111.h diff --git a/include/smc911x.h b/include/platform_data/eth-smc911x.h index 4a802ee52c..4a802ee52c 100644 --- a/include/smc911x.h +++ b/include/platform_data/eth-smc911x.h diff --git a/include/platform_ide.h b/include/platform_data/ide.h index f71fbfbc01..f71fbfbc01 100644 --- a/include/platform_ide.h +++ b/include/platform_data/ide.h diff --git a/include/ns16550.h b/include/platform_data/serial-ns16550.h index ccf950b077..ccf950b077 100644 --- a/include/ns16550.h +++ b/include/platform_data/serial-ns16550.h |