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
/
spitz.c
diff --git
a/arch/arm/mach-pxa/spitz.c
b/arch/arm/mach-pxa/spitz.c
index
b49a2c2
..
38e2c09
100644
(file)
--- a/
arch/arm/mach-pxa/spitz.c
+++ b/
arch/arm/mach-pxa/spitz.c
@@
-19,6
+19,7
@@
#include <linux/gpio.h>
#include <linux/leds.h>
#include <linux/i2c.h>
#include <linux/gpio.h>
#include <linux/leds.h>
#include <linux/i2c.h>
+#include <linux/i2c/pxa-i2c.h>
#include <linux/i2c/pca953x.h>
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
#include <linux/i2c/pca953x.h>
#include <linux/spi/spi.h>
#include <linux/spi/ads7846.h>
@@
-47,8
+48,6
@@
#include <mach/sharpsl_pm.h>
#include <mach/smemc.h>
#include <mach/sharpsl_pm.h>
#include <mach/smemc.h>
-#include <plat/i2c.h>
-
#include "generic.h"
#include "devices.h"
#include "generic.h"
#include "devices.h"