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 git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
em-x270.c
diff --git
a/arch/arm/mach-pxa/em-x270.c
b/arch/arm/mach-pxa/em-x270.c
index
a78bb30
..
b411d7c
100644
(file)
--- a/
arch/arm/mach-pxa/em-x270.c
+++ b/
arch/arm/mach-pxa/em-x270.c
@@
-31,6
+31,7
@@
#include <linux/apm-emulation.h>
#include <linux/i2c.h>
#include <linux/i2c/pca953x.h>
#include <linux/apm-emulation.h>
#include <linux/i2c.h>
#include <linux/i2c/pca953x.h>
+#include <linux/i2c/pxa-i2c.h>
#include <linux/regulator/userspace-consumer.h>
#include <media/soc_camera.h>
#include <linux/regulator/userspace-consumer.h>
#include <media/soc_camera.h>
@@
-45,7
+46,6
@@
#include <mach/ohci.h>
#include <mach/mmc.h>
#include <plat/pxa27x_keypad.h>
#include <mach/ohci.h>
#include <mach/mmc.h>
#include <plat/pxa27x_keypad.h>
-#include <plat/i2c.h>
#include <mach/camera.h>
#include "generic.h"
#include <mach/camera.h>
#include "generic.h"