diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-25 12:30:58 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-25 12:30:58 -0400 |
| commit | 7cafe60550469ad80e990d9223c4b5d501635015 (patch) | |
| tree | c432a5c1dd184d5c17cb57071100c240f374b0a6 | |
| parent | 5c58ceff103d8a654f24769bb1baaf84a841b0cc (diff) | |
| parent | c5e7f5a38a7ebf3697281bc7cb494e676f287ac0 (diff) | |
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
| -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 @@ | |||
| 37 | #include <linux/uaccess.h> | 37 | #include <linux/uaccess.h> |
| 38 | 38 | ||
| 39 | #include <asm/addrspace.h> | 39 | #include <asm/addrspace.h> |
| 40 | #include <asm/ar7/ar7.h> | 40 | #include <asm/mach-ar7/ar7.h> |
| 41 | 41 | ||
| 42 | #define DRVNAME "ar7_wdt" | 42 | #define DRVNAME "ar7_wdt" |
| 43 | #define LONGNAME "TI AR7 Watchdog Timer" | 43 | #define LONGNAME "TI AR7 Watchdog Timer" |