diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-25 09:30:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-25 09:30:58 -0700 |
| commit | 7cafe60550469ad80e990d9223c4b5d501635015 (patch) | |
| tree | c432a5c1dd184d5c17cb57071100c240f374b0a6 /drivers | |
| parent | tty: make sure to flush any pending work when halting the ldisc (diff) | |
| parent | [WATCHDOG] ar7_wdt: fix path to ar7-specific headers (diff) | |
| download | linux-dev-7cafe60550469ad80e990d9223c4b5d501635015.tar.xz linux-dev-7cafe60550469ad80e990d9223c4b5d501635015.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
[WATCHDOG] ar7_wdt: fix path to ar7-specific headers
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/watchdog/ar7_wdt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/ar7_wdt.c b/drivers/watchdog/ar7_wdt.c index 3fe9742c23ca..2f8643efe92c 100644 --- a/drivers/watchdog/ar7_wdt.c +++ b/drivers/watchdog/ar7_wdt.c @@ -37,7 +37,7 @@ #include <linux/uaccess.h> #include <asm/addrspace.h> -#include <asm/ar7/ar7.h> +#include <asm/mach-ar7/ar7.h> #define DRVNAME "ar7_wdt" #define LONGNAME "TI AR7 Watchdog Timer" |