From 3a32dd0a5d56a2ebb8b738fedcf5e64fb5ba1bbd Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 21 Dec 2012 15:49:16 +0100 Subject: arm: kirkwood: dockstar: remove useless include of SDIO header The dockstar platform does not register any SDIO controller, therefore it does not need to include the mmc-mvsdio.h header. Signed-off-by: Thomas Petazzoni Signed-off-by: Jason Cooper --- arch/arm/mach-kirkwood/dockstar-setup.c | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/arm/mach-kirkwood') 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 #include #include -#include #include "common.h" #include "mpp.h" -- cgit v1.2.3 From b96e1b1c3c5319294edb0970b6d5bf099c0e85eb Mon Sep 17 00:00:00 2001 From: Andrew Lunn Date: Fri, 28 Dec 2012 13:32:57 +0100 Subject: ARM: Kirkwood: Cleanup unneeded include files Remove include files which are no longer needed after converting to device tree. Signed-off-by: Andrew Lunn Signed-off-by: Jason Cooper --- arch/arm/mach-kirkwood/board-ib62x0.c | 1 - arch/arm/mach-kirkwood/board-mplcec4.c | 1 - 2 files changed, 2 deletions(-) (limited to 'arch/arm/mach-kirkwood') 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 #include #include -#include #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 #include #include "common.h" -#include "mpp.h" static struct mv643xx_eth_platform_data mplcec4_ge00_data = { .phy_addr = MV643XX_ETH_PHY_ADDR(1), -- cgit v1.2.3 From 7e5fa2f0aa14fde4e981143bf4635217c0883833 Mon Sep 17 00:00:00 2001 From: Jason Cooper Date: Wed, 23 Jan 2013 19:58:21 +0000 Subject: ARM: kirkwood: nsa310: cleanup includes and unneeded code After removing the unneeded linux/i2c.h, linux/of.h was needed for of_machine_is_compatible(). i2c.h had included of.h. Signed-off-by: Jason Cooper --- arch/arm/mach-kirkwood/board-nsa310.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'arch/arm/mach-kirkwood') 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 #include #include - -#include -#include #include +#include #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)); } -- cgit v1.2.3