diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2013-01-31 18:38:38 +0100 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-01-31 18:38:38 +0100 |
| commit | de7c007ff6bbabb87e0ac639848eb728e2234fa2 (patch) | |
| tree | 8a2d6914219c4e54cce010e90aa9041307413980 /arch/arm/mach-kirkwood | |
| parent | Merge tag 'tags/mvebu_fixes_for_v3.8-rc6' into mvebu/boards (diff) | |
| parent | ARM: dove: cleanup includes (diff) | |
| download | linux-de7c007ff6bbabb87e0ac639848eb728e2234fa2.tar.xz linux-de7c007ff6bbabb87e0ac639848eb728e2234fa2.zip | |
Merge tag 'tags/cleanup_for_v3.9_round2' into mvebu/boards
cleanup for v3.9 round2
- remove unneeded #includes for mach-dove
- remove unneeded #includes and code for the nsa310
Diffstat (limited to 'arch/arm/mach-kirkwood')
| -rw-r--r-- | arch/arm/mach-kirkwood/board-ib62x0.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/board-mplcec4.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/board-nsa310.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-kirkwood/dockstar-setup.c | 1 |
4 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/mach-kirkwood/board-ib62x0.c b/arch/arm/mach-kirkwood/board-ib62x0.c index 9f6f496380d8..9a857ae83984 100644 --- a/arch/arm/mach-kirkwood/board-ib62x0.c +++ b/arch/arm/mach-kirkwood/board-ib62x0.c @@ -14,7 +14,6 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/mv643xx_eth.h> -#include <linux/input.h> #include "common.h" static struct mv643xx_eth_platform_data ib62x0_ge00_data = { diff --git a/arch/arm/mach-kirkwood/board-mplcec4.c b/arch/arm/mach-kirkwood/board-mplcec4.c index 56bfe5a1605a..3264925b8318 100644 --- a/arch/arm/mach-kirkwood/board-mplcec4.c +++ b/arch/arm/mach-kirkwood/board-mplcec4.c @@ -14,7 +14,6 @@ #include <linux/mv643xx_eth.h> #include <linux/platform_data/mmc-mvsdio.h> #include "common.h" -#include "mpp.h" static struct mv643xx_eth_platform_data mplcec4_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(1), diff --git a/arch/arm/mach-kirkwood/board-nsa310.c b/arch/arm/mach-kirkwood/board-nsa310.c index f58d2e1a4042..2fa71400ecb3 100644 --- a/arch/arm/mach-kirkwood/board-nsa310.c +++ b/arch/arm/mach-kirkwood/board-nsa310.c @@ -12,10 +12,8 @@ #include <linux/init.h> #include <linux/i2c.h> #include <linux/gpio.h> - -#include <asm/mach-types.h> -#include <asm/mach/arch.h> #include <mach/kirkwood.h> +#include <linux/of.h> #include "common.h" #include "mpp.h" @@ -79,14 +77,10 @@ static void __init nsa310_gpio_init(void) void __init nsa310_init(void) { - u32 dev, rev; - kirkwood_mpp_conf(nsa310_mpp_config); nsa310_gpio_init(); - kirkwood_pcie_id(&dev, &rev); - i2c_register_board_info(0, ARRAY_AND_SIZE(nsa310_i2c_info)); } diff --git a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c index 791a98fafa29..272af6970f61 100644 --- a/arch/arm/mach-kirkwood/dockstar-setup.c +++ b/arch/arm/mach-kirkwood/dockstar-setup.c @@ -19,7 +19,6 @@ #include <asm/mach-types.h> #include <asm/mach/arch.h> #include <mach/kirkwood.h> -#include <linux/platform_data/mmc-mvsdio.h> #include "common.h" #include "mpp.h" |