diff options
author | Olof Johansson <olof@lixom.net> | 2012-11-30 01:39:11 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-11-30 01:39:11 -0500 |
commit | 68fb31706d50dd5d337cd7928aeb780358b910a5 (patch) | |
tree | 6632d05aae22e99d7f128104b536bfdfc225a696 /arch/arm/mach-kirkwood/board-iconnect.c | |
parent | 9489e9dcae718d5fde988e4a684a0f55b5f94d17 (diff) | |
parent | c8a1ceccf394b2f99feed2b702732140e9f0f92d (diff) |
Merge branch 'next/cleanup' into next/pm2
By Tony Lindgren (36) and others
via Tony Lindgren (22) and others
* next/cleanup: (303 commits)
ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan
ARM: OMAP3: cm-t3517: use GPTIMER for system clock
ARM: OMAP2+: timer: remove CONFIG_OMAP_32K_TIMER
ARM: SAMSUNG: use devm_ functions for ADC driver
ARM: EXYNOS: no duplicate mask/unmask in eint0_15
ARM: S3C24XX: SPI clock channel setup is fixed for S3C2443
ARM: EXYNOS: Remove i2c0 resource information and setting of device names
ARM: Kirkwood: checkpatch cleanups
ARM: Kirkwood: Fix sparse warnings.
ARM: Kirkwood: Remove unused includes
ARM: kirkwood: cleanup lsxl board includes
ARM: integrator: use BUG_ON where possible
ARM: integrator: push down SC dependencies
ARM: integrator: delete static UART1 mapping
ARM: integrator: delete SC mapping on the CP
ARM: integrator: remove static CP syscon mapping
ARM: integrator: remove static AP syscon mapping
ARM: integrator: hook the CP into the SoC bus
ARM: integrator: hook the AP into the SoC bus
ARM: OMAP2+: Fix compiler warning for 32k timer
...
Diffstat (limited to 'arch/arm/mach-kirkwood/board-iconnect.c')
-rw-r--r-- | arch/arm/mach-kirkwood/board-iconnect.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c index d084b1e2943a..24f5aa7f698b 100644 --- a/arch/arm/mach-kirkwood/board-iconnect.c +++ b/arch/arm/mach-kirkwood/board-iconnect.c | |||
@@ -10,16 +10,8 @@ | |||
10 | 10 | ||
11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
13 | #include <linux/platform_device.h> | ||
14 | #include <linux/of.h> | 13 | #include <linux/of.h> |
15 | #include <linux/of_address.h> | ||
16 | #include <linux/of_fdt.h> | ||
17 | #include <linux/of_irq.h> | ||
18 | #include <linux/of_platform.h> | ||
19 | #include <linux/mv643xx_eth.h> | 14 | #include <linux/mv643xx_eth.h> |
20 | #include <linux/gpio.h> | ||
21 | #include <asm/mach/arch.h> | ||
22 | #include <mach/kirkwood.h> | ||
23 | #include "common.h" | 15 | #include "common.h" |
24 | #include "mpp.h" | 16 | #include "mpp.h" |
25 | 17 | ||