diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-22 13:26:25 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-22 13:26:25 -0700 |
| commit | d7ffa2234c186ce040e79b43639628c1c482b115 (patch) | |
| tree | 3bf59d2f2714be57058c43fe55f638cf932c6dc2 /arch/arm | |
| parent | d6a93ceb3f523be3a00b5ee8c6380653c764927b (diff) | |
| parent | 54672d3241be93e48535ecc64b70ea4cf66723bc (diff) | |
| download | linux-d7ffa2234c186ce040e79b43639628c1c482b115.tar.gz linux-d7ffa2234c186ce040e79b43639628c1c482b115.tar.bz2 linux-d7ffa2234c186ce040e79b43639628c1c482b115.zip | |
Merge branch 'kirkwood/cleanup' of git://git.infradead.org/users/jcooper/linux into late/kirkwood
From Jason Cooper:
Misc:
- trim includes for board-dnskw.c
* 'kirkwood/cleanup' of git://git.infradead.org/users/jcooper/linux:
ARM: kirkwood: Trim excess #includes in board-dnskw.c
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-kirkwood/board-dnskw.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-kirkwood/board-dnskw.c b/arch/arm/mach-kirkwood/board-dnskw.c index 6ac7a8dc7b78..43d16d6714b8 100644 --- a/arch/arm/mach-kirkwood/board-dnskw.c +++ b/arch/arm/mach-kirkwood/board-dnskw.c @@ -14,17 +14,8 @@ #include <linux/kernel.h> #include <linux/init.h> #include <linux/platform_device.h> -#include <linux/ata_platform.h> #include <linux/mv643xx_eth.h> -#include <linux/of.h> #include <linux/gpio.h> -#include <linux/input.h> -#include <linux/leds.h> -#include <asm/mach-types.h> -#include <asm/mach/arch.h> -#include <asm/mach/map.h> -#include <mach/kirkwood.h> -#include <mach/bridge-regs.h> #include "common.h" #include "mpp.h" |