aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-bf548/head.S
diff options
context:
space:
mode:
authorRobert Richter <robert.richter@amd.com>2008-09-24 11:25:31 +0200
committerRobert Richter <robert.richter@amd.com>2008-09-24 11:25:31 +0200
commitf78e80209cf143be49f268c340431ae9fa3abb74 (patch)
tree820fa64b688099dfdd93d27ba03252738ca5c7e2 /arch/blackfin/mach-bf548/head.S
parent4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d (diff)
parent24342c34a022ee90839873d91396045e12ef1090 (diff)
downloadkernel_samsung_tuna-f78e80209cf143be49f268c340431ae9fa3abb74.zip
kernel_samsung_tuna-f78e80209cf143be49f268c340431ae9fa3abb74.tar.gz
kernel_samsung_tuna-f78e80209cf143be49f268c340431ae9fa3abb74.tar.bz2
Merge commit 'v2.6.27-rc5' into tip/oprofile
Conflicts: arch/x86/oprofile/nmi_int.c
Diffstat (limited to 'arch/blackfin/mach-bf548/head.S')
-rw-r--r--arch/blackfin/mach-bf548/head.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-bf548/head.S b/arch/blackfin/mach-bf548/head.S
index e3000f7..4d5cfea 100644
--- a/arch/blackfin/mach-bf548/head.S
+++ b/arch/blackfin/mach-bf548/head.S
@@ -31,8 +31,8 @@
#include <linux/init.h>
#include <asm/blackfin.h>
#ifdef CONFIG_BFIN_KERNEL_CLOCK
-#include <asm/mach-common/clocks.h>
-#include <asm/mach/mem_init.h>
+#include <asm/clocks.h>
+#include <mach/mem_init.h>
#endif
.section .l1.text