Merge branches 'oprofile-v2' and 'timers/hpet' into x86/core-v4

[linux-2.6-omap-h63xx.git] / arch / powerpc / sysdev / micropatch.c

diff --git a/arch/powerpc/sysdev/micropatch.c b/arch/powerpc/sysdev/micropatch.c
index 712b10a55f87bf1964f96d89e83d939ff06e8cd4..d8d602840757cad9301fd5a2a38f2ed7ee6dec6b 100644 (file)
--- a/arch/powerpc/sysdev/micropatch.c
+++ b/arch/powerpc/sysdev/micropatch.c
@@ -16,7 +16,7 @@
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/8xx_immap.h>
-#include <asm/commproc.h>
+#include <asm/cpm1.h>
 
 /*
  * I2C/SPI relocation patch arrays.