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 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
trizeps4.c
diff --git
a/arch/arm/mach-pxa/trizeps4.c
b/arch/arm/mach-pxa/trizeps4.c
index
423261d
..
857bb2e
100644
(file)
--- a/
arch/arm/mach-pxa/trizeps4.c
+++ b/
arch/arm/mach-pxa/trizeps4.c
@@
-26,6
+26,7
@@
#include <linux/dm9000.h>
#include <linux/mtd/physmap.h>
#include <linux/mtd/partitions.h>
#include <linux/dm9000.h>
#include <linux/mtd/physmap.h>
#include <linux/mtd/partitions.h>
+#include <linux/i2c/pxa-i2c.h>
#include <asm/types.h>
#include <asm/setup.h>
#include <asm/types.h>
#include <asm/setup.h>
@@
-47,7
+48,6
@@
#include <mach/irda.h>
#include <mach/ohci.h>
#include <mach/smemc.h>
#include <mach/irda.h>
#include <mach/ohci.h>
#include <mach/smemc.h>
-#include <plat/i2c.h>
#include "generic.h"
#include "devices.h"
#include "generic.h"
#include "devices.h"