diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-26 01:26:14 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-26 01:26:49 -0800 |
| commit | 52cfa7e54b480661e20dfd8788a24cfcba8a0ca5 (patch) | |
| tree | 1624420fb5814cb659f710967d6fb980110d40bf /arch/arm/mach-kirkwood/board-iomega_ix2_200.c | |
| parent | 2a18588c0ce336933be3c99c91e74e21db56a0fe (diff) | |
| parent | 4a9329a04ceec56fc1ec155b6ea4d8b50f350a7b (diff) | |
| download | linux-52cfa7e54b480661e20dfd8788a24cfcba8a0ca5.tar.gz | |
Merge branch 'orion/cleanup' into orion/dt
Merge in the cleanups that should have been used as the base of the DT branch instead of letting the conflicts be exposed all the way up to the toplevel merges. All of these are caused by cleanups being done both in the cleanup branch and the dt branch, resulting in remove/remove conflicts of header files. By Andrew Lunn (3) and others via Jason Cooper * orion/cleanup: ARM: Kirkwood: Use hw_pci.ops instead of hw_pci.scan ARM: Kirkwood: checkpatch cleanups ARM: Kirkwood: Fix sparse warnings. ARM: Kirkwood: Remove unused includes ARM: kirkwood: cleanup lsxl board includes Remove/remove conflicts in: arch/arm/mach-kirkwood/board-dockstar.c arch/arm/mach-kirkwood/board-goflexnet.c arch/arm/mach-kirkwood/board-lsxl.c Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-kirkwood/board-iomega_ix2_200.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/board-iomega_ix2_200.c b/arch/arm/mach-kirkwood/board-iomega_ix2_200.c index 22b86494671f..f655b2637b0e 100644 --- a/arch/arm/mach-kirkwood/board-iomega_ix2_200.c +++ b/arch/arm/mach-kirkwood/board-iomega_ix2_200.c @@ -10,10 +10,8 @@ #include <linux/kernel.h> #include <linux/init.h> -#include <linux/platform_device.h> #include <linux/mv643xx_eth.h> #include <linux/ethtool.h> -#include <mach/kirkwood.h> #include "common.h" static struct mv643xx_eth_platform_data iomega_ix2_200_ge00_data = { |