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 'viafb-next' of git://github.com/schandinat/linux-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
mxm8x10.c
diff --git
a/arch/arm/mach-pxa/mxm8x10.c
b/arch/arm/mach-pxa/mxm8x10.c
index
cdf7f41
..
b5a8fd3
100644
(file)
--- a/
arch/arm/mach-pxa/mxm8x10.c
+++ b/
arch/arm/mach-pxa/mxm8x10.c
@@
-22,8
+22,8
@@
#include <linux/serial_8250.h>
#include <linux/dm9000.h>
#include <linux/gpio.h>
+#include <linux/i2c/pxa-i2c.h>
-#include <plat/i2c.h>
#include <plat/pxa3xx_nand.h>
#include <mach/pxafb.h>