diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 22:31:56 +0200 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 22:31:56 +0200 |
commit | 6a4690c22f5da1eb1c898b61b6a80da52fbd976f (patch) | |
tree | a03891a32abe0da191fb765fe669a597e07423c6 /arch/blackfin/mach-common/arch_checks.c | |
parent | Merge branches 'machtypes', 'core', 'ep93xx', 'ks8695', 'netdev' and 'sa1100'... (diff) | |
parent | [ARM] Improve non-executable support (diff) | |
download | linux-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.tar.xz linux-6a4690c22f5da1eb1c898b61b6a80da52fbd976f.zip |
Merge branch 'ptebits' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/blackfin/mach-common/arch_checks.c')
-rw-r--r-- | arch/blackfin/mach-common/arch_checks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-common/arch_checks.c b/arch/blackfin/mach-common/arch_checks.c index 5986758b2752..98133b968f7b 100644 --- a/arch/blackfin/mach-common/arch_checks.c +++ b/arch/blackfin/mach-common/arch_checks.c @@ -28,8 +28,8 @@ */ #include <asm/fixed_code.h> -#include <asm/mach/anomaly.h> -#include <asm/mach-common/clocks.h> +#include <mach/anomaly.h> +#include <asm/clocks.h> #ifdef CONFIG_BFIN_KERNEL_CLOCK |