diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-22 10:08:43 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 10:08:43 -0800 |
| commit | a76df42a675c9936e8bf3607226e74c8a5e2d847 (patch) | |
| tree | 96d93706d884dea956393653452fa4d78d8d7f76 /drivers/watchdog | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
| parent | 8171d88089ad63fc442b2bf32af7c18653adc5cb (diff) | |
| download | kernel_samsung_espresso10-a76df42a675c9936e8bf3607226e74c8a5e2d847.zip kernel_samsung_espresso10-a76df42a675c9936e8bf3607226e74c8a5e2d847.tar.gz kernel_samsung_espresso10-a76df42a675c9936e8bf3607226e74c8a5e2d847.tar.bz2 | |
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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c index 3ed571a..429ea99 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" |