]> err.no Git - linux-2.6/blobdiff - arch/blackfin/mach-bf527/head.S
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[linux-2.6] / arch / blackfin / mach-bf527 / head.S
index c3334cc5bcb7db9f724a4f57d75813fe4ccdae8c..28c486191209669f1bc2cd48f82fe8930d8e3c09 100644 (file)
@@ -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