summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2009-11-22 19:08:43 +0100
committerTony Lindgren <tony@atomide.com>2009-11-22 19:08:43 +0100
commita76df42a675c9936e8bf3607226e74c8a5e2d847 (patch)
tree96d93706d884dea956393653452fa4d78d8d7f76 /drivers/watchdog
parentLinux 2.6.32-rc8 (diff)
parentMerge branch 'pm-upstream/pm-cpuidle' of ssh://master.kernel.org/pub/scm/linu... (diff)
downloadlinux-a76df42a675c9936e8bf3607226e74c8a5e2d847.tar.xz
linux-a76df42a675c9936e8bf3607226e74c8a5e2d847.zip
Merge 7xx-iosplit-plat-merge with omap-fixes
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/omap_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c
index 3ed571a2ab18..429ea99eaee5 100644
--- a/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@ -43,7 +43,7 @@
#include <linux/io.h>
#include <linux/uaccess.h>
#include <mach/hardware.h>
-#include <mach/prcm.h>
+#include <plat/prcm.h>
#include "omap_wdt.h"