diff options
| author | Olof Johansson <olof@lixom.net> | 2012-09-22 16:26:25 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-09-22 16:26:25 -0400 |
| commit | d7ffa2234c186ce040e79b43639628c1c482b115 (patch) | |
| tree | 3bf59d2f2714be57058c43fe55f638cf932c6dc2 /arch/arm/mach-kirkwood | |
| parent | d6a93ceb3f523be3a00b5ee8c6380653c764927b (diff) | |
| parent | 54672d3241be93e48535ecc64b70ea4cf66723bc (diff) | |
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/mach-kirkwood')
| -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 @@ | |||
| 14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
| 15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
| 16 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
| 17 | #include <linux/ata_platform.h> | ||
| 18 | #include <linux/mv643xx_eth.h> | 17 | #include <linux/mv643xx_eth.h> |
| 19 | #include <linux/of.h> | ||
| 20 | #include <linux/gpio.h> | 18 | #include <linux/gpio.h> |
| 21 | #include <linux/input.h> | ||
| 22 | #include <linux/leds.h> | ||
| 23 | #include <asm/mach-types.h> | ||
| 24 | #include <asm/mach/arch.h> | ||
| 25 | #include <asm/mach/map.h> | ||
| 26 | #include <mach/kirkwood.h> | ||
| 27 | #include <mach/bridge-regs.h> | ||
| 28 | #include "common.h" | 19 | #include "common.h" |
| 29 | #include "mpp.h" | 20 | #include "mpp.h" |
| 30 | 21 | ||