projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'misc-2.6.32' into release
[linux-block.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/c
ommproc
.h>
+#include <asm/c
pm1
.h>
/*
* I2C/SPI relocation patch arrays.