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 git://git.kernel.org/pub/scm/fs/xfs/xfs
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
zylonite_pxa300.c
diff --git
a/arch/arm/mach-pxa/zylonite_pxa300.c
b/arch/arm/mach-pxa/zylonite_pxa300.c
index
4653888
..
c1f7320
100644
(file)
--- a/
arch/arm/mach-pxa/zylonite_pxa300.c
+++ b/
arch/arm/mach-pxa/zylonite_pxa300.c
@@
-18,9
+18,9
@@
#include <linux/init.h>
#include <linux/i2c.h>
#include <linux/i2c/pca953x.h>
+#include <linux/gpio.h>
-#include <asm/gpio.h>
-#include <mach/mfp-pxa300.h>
+#include <mach/pxa300.h>
#include <mach/i2c.h>
#include <mach/zylonite.h>