summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-01-27 21:39:08 -0800
committerOlof Johansson <olof@lixom.net>2013-01-27 21:39:08 -0800
commit1f87a404d02a96519284e1928445ca5cfe9667db (patch)
treecee6e340d7ecb568161c5b5c0941cdb057b14f1e
parent7d47f3643213ed8d8fa885cf166e2685fa85d6fb (diff)
parentb96e1b1c3c5319294edb0970b6d5bf099c0e85eb (diff)
downloadlwn-1f87a404d02a96519284e1928445ca5cfe9667db.tar.gz
lwn-1f87a404d02a96519284e1928445ca5cfe9667db.zip
Merge tag 'cleanup_for_v3.9' of git://git.infradead.org/users/jcooper/linux into next/cleanup
From Jason Cooper: mvebu cleanup for v3.9 - remove unneeded includes due to DT conversion * tag 'cleanup_for_v3.9' of git://git.infradead.org/users/jcooper/linux: ARM: Kirkwood: Cleanup unneeded include files arm: kirkwood: dockstar: remove useless include of SDIO header Signed-off-by: Olof Johansson <olof@lixom.net>
-rw-r--r--arch/arm/mach-kirkwood/board-ib62x0.c1
-rw-r--r--arch/arm/mach-kirkwood/board-mplcec4.c1
-rw-r--r--arch/arm/mach-kirkwood/dockstar-setup.c1
3 files changed, 0 insertions, 3 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/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
index 77f98f2b0416..060ccf9cb63f 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"