diff options
| author | Olof Johansson <olof@lixom.net> | 2012-11-26 10:27:27 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-11-26 10:27:31 +0100 |
| commit | 61da823ab9f1e554da58f1c9f75931829582ad4f (patch) | |
| tree | bb55b966f3da3de6ff0ccad70fca3dc16c35786d /arch/arm/mach-kirkwood/board-dreamplug.c | |
| parent | Merge tag 'orion_dt_for_3.8' of git://git.infradead.org/users/jcooper/linux i... (diff) | |
| parent | Merge branch 'orion/cleanup' into orion/dt (diff) | |
| download | linux-61da823ab9f1e554da58f1c9f75931829582ad4f.tar.xz linux-61da823ab9f1e554da58f1c9f75931829582ad4f.zip | |
Merge branch 'orion/dt' into next/dt
Merge in orion's cleanup branch together with the DT contents. Ideally
the cleanup branch should have been the base for the DT branch to avoid
these, but that was missed when first merging. So we're doing it now to
reduce the amount of silly conflicts due to internal tree organization.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-kirkwood/board-dreamplug.c')
| -rw-r--r-- | arch/arm/mach-kirkwood/board-dreamplug.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/mach-kirkwood/board-dreamplug.c b/arch/arm/mach-kirkwood/board-dreamplug.c index 3e2d95d629ee..08248e24ffcd 100644 --- a/arch/arm/mach-kirkwood/board-dreamplug.c +++ b/arch/arm/mach-kirkwood/board-dreamplug.c @@ -13,23 +13,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/of_address.h> -#include <linux/of_fdt.h> -#include <linux/of_irq.h> -#include <linux/of_platform.h> #include <linux/gpio.h> -#include <linux/mtd/physmap.h> -#include <linux/spi/flash.h> -#include <linux/spi/spi.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 <linux/platform_data/mmc-mvsdio.h> #include "common.h" |