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 commit 'v2.6.28-rc9' into x86/apic
[pandora-kernel.git]
/
drivers
/
i2c
/
busses
/
i2c-acorn.c
diff --git
a/drivers/i2c/busses/i2c-acorn.c
b/drivers/i2c/busses/i2c-acorn.c
index
7c2be35
..
75089fe
100644
(file)
--- a/
drivers/i2c/busses/i2c-acorn.c
+++ b/
drivers/i2c/busses/i2c-acorn.c
@@
-16,7
+16,7
@@
#include <linux/i2c.h>
#include <linux/i2c-algo-bit.h>
-#include <
asm
/hardware.h>
+#include <
mach
/hardware.h>
#include <asm/io.h>
#include <asm/hardware/ioc.h>
#include <asm/system.h>