diff options
| author | Russell King | 2008-08-05 17:14:15 +0200 |
|---|---|---|
| committer | Russell King | 2008-08-07 10:55:48 +0200 |
| commit | a09e64fbc0094e3073dbb09c3b4bfe4ab669244b (patch) | |
| tree | 69689f467179891b498bd7423fcf61925173db31 /drivers/watchdog/sa1100_wdt.c | |
| parent | Merge branch 'header-move' of git://git.kernel.org/pub/scm/linux/kernel/git/h... (diff) | |
| download | kernel-qcow2-linux-a09e64fbc0094e3073dbb09c3b4bfe4ab669244b.tar.gz kernel-qcow2-linux-a09e64fbc0094e3073dbb09c3b4bfe4ab669244b.tar.xz kernel-qcow2-linux-a09e64fbc0094e3073dbb09c3b4bfe4ab669244b.zip | |
[ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach
This just leaves include/asm-arm/plat-* to deal with.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/watchdog/sa1100_wdt.c')
| -rw-r--r-- | drivers/watchdog/sa1100_wdt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/watchdog/sa1100_wdt.c b/drivers/watchdog/sa1100_wdt.c index d985cba40dde..52a533c274fd 100644 --- a/drivers/watchdog/sa1100_wdt.c +++ b/drivers/watchdog/sa1100_wdt.c @@ -28,10 +28,10 @@ #include <linux/bitops.h> #ifdef CONFIG_ARCH_PXA -#include <asm/arch/pxa-regs.h> +#include <mach/pxa-regs.h> #endif -#include <asm/arch/hardware.h> +#include <mach/hardware.h> #include <asm/uaccess.h> #define OSCR_FREQ CLOCK_TICK_RATE |