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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
littleton.c
diff --git
a/arch/arm/mach-pxa/littleton.c
b/arch/arm/mach-pxa/littleton.c
index
4b2c45f
..
e5e326d
100644
(file)
--- a/
arch/arm/mach-pxa/littleton.c
+++ b/
arch/arm/mach-pxa/littleton.c
@@
-28,6
+28,7
@@
#include <linux/leds.h>
#include <linux/mfd/da903x.h>
#include <linux/i2c/max732x.h>
#include <linux/leds.h>
#include <linux/mfd/da903x.h>
#include <linux/i2c/max732x.h>
+#include <linux/i2c/pxa-i2c.h>
#include <asm/types.h>
#include <asm/setup.h>
#include <asm/types.h>
#include <asm/setup.h>
@@
-45,7
+46,6
@@
#include <mach/mmc.h>
#include <plat/pxa27x_keypad.h>
#include <mach/littleton.h>
#include <mach/mmc.h>
#include <plat/pxa27x_keypad.h>
#include <mach/littleton.h>
-#include <plat/i2c.h>
#include <plat/pxa3xx_nand.h>
#include "generic.h"
#include <plat/pxa3xx_nand.h>
#include "generic.h"