diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 17:25:46 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 17:25:46 +0200 |
commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/mips/lantiq/devices.c | |
parent | arm/dt: tegra devicetree support (diff) | |
parent | dmaengine: imx-sdma: add device tree probe support (diff) | |
download | linux-6124a4e430b64d1577438c8648c59e996d02e73e.tar.xz linux-6124a4e430b64d1577438c8648c59e996d02e73e.zip |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'arch/mips/lantiq/devices.c')
-rw-r--r-- | arch/mips/lantiq/devices.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/mips/lantiq/devices.c b/arch/mips/lantiq/devices.c index 7b82c34cb169..44a36771c819 100644 --- a/arch/mips/lantiq/devices.c +++ b/arch/mips/lantiq/devices.c @@ -15,11 +15,9 @@ #include <linux/platform_device.h> #include <linux/leds.h> #include <linux/etherdevice.h> -#include <linux/reboot.h> #include <linux/time.h> #include <linux/io.h> #include <linux/gpio.h> -#include <linux/leds.h> #include <asm/bootinfo.h> #include <asm/irq.h> |