diff options
| author | root <root@dyn-67.arm.linux.org.uk> | 2009-03-24 18:04:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-24 18:04:25 -0400 |
| commit | 9a38e989b8ce04923f919fc2a8a24eb07fb484e2 (patch) | |
| tree | 6b99638dc32b99420ada46ca8d1373ad7aa5a208 /arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | |
| parent | 7d83f8fca517b123cf0136503a9e50974f65ec49 (diff) | |
| parent | 5fa82eb8ff06cd3ac4d64c6875922ae1dfa003c5 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel
Diffstat (limited to 'arch/arm/mach-pxa/include/mach/mfp-pxa27x.h')
| -rw-r--r-- | arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h index da4f85a4f990..6543c05f47ed 100644 --- a/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h +++ b/arch/arm/mach-pxa/include/mach/mfp-pxa27x.h | |||
| @@ -8,7 +8,6 @@ | |||
| 8 | * specific controller, and this should work in most cases. | 8 | * specific controller, and this should work in most cases. |
| 9 | */ | 9 | */ |
| 10 | 10 | ||
| 11 | #include <mach/mfp.h> | ||
| 12 | #include <mach/mfp-pxa2xx.h> | 11 | #include <mach/mfp-pxa2xx.h> |
| 13 | 12 | ||
| 14 | /* Note: GPIO3/GPIO4 will be driven by Power I2C when PCFR/PI2C_EN | 13 | /* Note: GPIO3/GPIO4 will be driven by Power I2C when PCFR/PI2C_EN |