summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2012-11-16 17:11:46 +0100
committerArnd Bergmann <arnd@arndb.de>2012-11-16 17:11:46 +0100
commitbac2f668864eca45b702ee394bef4c5f3a86658c (patch)
tree9b82100e2f447ae2b3b20f4a935b8020c885adcf /drivers/watchdog
parentcff9f37a1e7b2565f254b5ab40c3213cc0f823a1 (diff)
parent632506a21a3b5f0596e89d55cda6b482bec331a3 (diff)
downloadop-kernel-dev-bac2f668864eca45b702ee394bef4c5f3a86658c.zip
op-kernel-dev-bac2f668864eca45b702ee394bef4c5f3a86658c.tar.gz
Merge tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6 into next/dt
From Sascha Hauer <s.hauer@pengutronix.de>: ARM i.MX dt updates for 3.8 * tag 'imx-dt' of git://git.pengutronix.de/git/imx/linux-2.6: Add device tree file for the armadeus apf27 ARM i.MX: Add Ka-Ro TX25 devicetree ARM i.MX25: Add devicetree ARM i.MX25: Add devicetree support ARM i.MX25: Add missing clock gates Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/imx2_wdt.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/watchdog/imx2_wdt.c b/drivers/watchdog/imx2_wdt.c
index bcfab2b..9a45d029 100644
--- a/drivers/watchdog/imx2_wdt.c
+++ b/drivers/watchdog/imx2_wdt.c
@@ -33,7 +33,6 @@
#include <linux/uaccess.h>
#include <linux/timer.h>
#include <linux/jiffies.h>
-#include <mach/hardware.h>
#define DRIVER_NAME "imx2-wdt"
OpenPOWER on IntegriCloud