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 branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
colibri-evalboard.c
diff --git
a/arch/arm/mach-pxa/colibri-evalboard.c
b/arch/arm/mach-pxa/colibri-evalboard.c
index
28f667e
..
81c3c43
100644
(file)
--- a/
arch/arm/mach-pxa/colibri-evalboard.c
+++ b/
arch/arm/mach-pxa/colibri-evalboard.c
@@
-20,6
+20,7
@@
#include <mach/hardware.h>
#include <asm/mach/arch.h>
#include <linux/i2c.h>
#include <mach/hardware.h>
#include <asm/mach/arch.h>
#include <linux/i2c.h>
+#include <linux/i2c/pxa-i2c.h>
#include <mach/pxa27x.h>
#include <mach/colibri.h>
#include <mach/pxa27x.h>
#include <mach/colibri.h>
@@
-27,8
+28,6
@@
#include <mach/ohci.h>
#include <mach/pxa27x-udc.h>
#include <mach/ohci.h>
#include <mach/pxa27x-udc.h>
-#include <plat/i2c.h>
-
#include "generic.h"
#include "devices.h"
#include "generic.h"
#include "devices.h"