summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-08-25 09:30:58 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-08-25 09:30:58 -0700
commit7cafe60550469ad80e990d9223c4b5d501635015 (patch)
treec432a5c1dd184d5c17cb57071100c240f374b0a6 /drivers
parent5c58ceff103d8a654f24769bb1baaf84a841b0cc (diff)
parentc5e7f5a38a7ebf3697281bc7cb494e676f287ac0 (diff)
downloadlinux-7cafe60550469ad80e990d9223c4b5d501635015.tar.bz2
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.c2
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"