git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next-i2c' of git://git.fluff.org/bjdooks/linux
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
85xx
/
sbc8548.c
diff --git
a/arch/powerpc/platforms/85xx/sbc8548.c
b/arch/powerpc/platforms/85xx/sbc8548.c
index
ecdd8c0
..
d07dcb7
100644
(file)
--- a/
arch/powerpc/platforms/85xx/sbc8548.c
+++ b/
arch/powerpc/platforms/85xx/sbc8548.c
@@
-34,7
+34,7
@@
#include <asm/system.h>
#include <asm/pgtable.h>
#include <asm/page.h>
-#include <
asm
/atomic.h>
+#include <
linux
/atomic.h>
#include <asm/time.h>
#include <asm/io.h>
#include <asm/machdep.h>