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.infradead.org/users/dwmw2/solos-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
include
/
mach
/
mfp-pxa27x.h
diff --git
a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
index
da4f85a
..
6543c05
100644
(file)
--- a/
arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
+++ b/
arch/arm/mach-pxa/include/mach/mfp-pxa27x.h
@@
-8,7
+8,6
@@
* specific controller, and this should work in most cases.
*/
-#include <mach/mfp.h>
#include <mach/mfp-pxa2xx.h>
/* Note: GPIO3/GPIO4 will be driven by Power I2C when PCFR/PI2C_EN