diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-06 16:51:57 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-06 16:51:57 +0200 |
commit | 7f79d852ed30a06eebf7497afe9334a726db3d40 (patch) | |
tree | 0057281f17501b635d3d88cda9a14203706f5dcc /arch/blackfin/mach-common/arch_checks.c | |
parent | aef745fca016aea45adae5c98e8698904dd8ad51 (diff) | |
parent | 70bb08962ea9bd50797ae9f16b2493f5f7c65053 (diff) |
Merge branch 'linus' into sched/devel
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 5986758b275..98133b968f7 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 |