diff options
| author | James Morris <jmorris@namei.org> | 2009-08-20 01:18:42 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-08-20 01:18:42 +0200 |
| commit | ece13879e74313e62109e0755dd3d4f172df89e2 (patch) | |
| tree | 1fe96ab392c1ff203a6fb3f67ed0ed577056572e /arch/arm/mach-mx3/pcm037_eet.c | |
| parent | Security/SELinux: remove duplicated #include (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ryu... (diff) | |
| download | linux-ece13879e74313e62109e0755dd3d4f172df89e2.tar.xz linux-ece13879e74313e62109e0755dd3d4f172df89e2.zip | |
Merge branch 'master' into next
Conflicts:
security/Kconfig
Manual fix.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'arch/arm/mach-mx3/pcm037_eet.c')
| -rw-r--r-- | arch/arm/mach-mx3/pcm037_eet.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-mx3/pcm037_eet.c b/arch/arm/mach-mx3/pcm037_eet.c index fe52fb1bb8b7..8d386000fc40 100644 --- a/arch/arm/mach-mx3/pcm037_eet.c +++ b/arch/arm/mach-mx3/pcm037_eet.c @@ -24,15 +24,6 @@ #include "devices.h" static unsigned int pcm037_eet_pins[] = { - /* SPI #1 */ - MX31_PIN_CSPI1_MISO__MISO, - MX31_PIN_CSPI1_MOSI__MOSI, - MX31_PIN_CSPI1_SCLK__SCLK, - MX31_PIN_CSPI1_SPI_RDY__SPI_RDY, - MX31_PIN_CSPI1_SS0__SS0, - MX31_PIN_CSPI1_SS1__SS1, - MX31_PIN_CSPI1_SS2__SS2, - /* Reserve and hardwire GPIO 57 high - S6E63D6 chipselect */ IOMUX_MODE(MX31_PIN_KEY_COL7, IOMUX_CONFIG_GPIO), /* GPIO keys */ |