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' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-mmp
/
include
/
mach
/
pxa910.h
diff --git
a/arch/arm/mach-mmp/include/mach/pxa910.h
b/arch/arm/mach-mmp/include/mach/pxa910.h
index
f13c49d
..
91be755
100644
(file)
--- a/
arch/arm/mach-mmp/include/mach/pxa910.h
+++ b/
arch/arm/mach-mmp/include/mach/pxa910.h
@@
-7,8
+7,8
@@
extern struct sys_timer pxa910_timer;
extern void __init pxa910_init_irq(void);
#include <linux/i2c.h>
+#include <linux/i2c/pxa-i2c.h>
#include <mach/devices.h>
-#include <plat/i2c.h>
#include <plat/pxa3xx_nand.h>
extern struct pxa_device_desc pxa910_device_uart1;