summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAndrew Victor <linux@maxim.org.za>2008-11-05 21:18:41 +0100
committerWim Van Sebroeck <wim@iguana.be>2008-11-06 09:44:11 +0100
commitb954f6f63e7938a11de5bd15cb5cbcac7423cf97 (patch)
tree71fd96c70b97cf4939527b63fd949a7f4e4864b7 /drivers
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
downloadlinux-b954f6f63e7938a11de5bd15cb5cbcac7423cf97.tar.xz
linux-b954f6f63e7938a11de5bd15cb5cbcac7423cf97.zip
[WATCHDOG] SAM9 watchdog - update for moved headers
The architecture header files were recently moved from include/asm-arm/mach-at91/ to arch/arm/mach-at91/include/mach/. The SAM9 watchdog driver still includes a header from the old location. Signed-off-by: Andrew Victor <linux@maxim.org.za> Signed-off-by: Wim Van Sebroeck <wim@iguana.be> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/watchdog/at91sam9_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c
index b4babfc31586..b1da287f90ec 100644
--- a/drivers/watchdog/at91sam9_wdt.c
+++ b/drivers/watchdog/at91sam9_wdt.c
@@ -30,7 +30,7 @@
#include <linux/bitops.h>
#include <linux/uaccess.h>
-#include <asm/arch/at91_wdt.h>
+#include <mach/at91_wdt.h>
#define DRV_NAME "AT91SAM9 Watchdog"