diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-18 01:20:14 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-18 01:20:14 +0100 |
| commit | 8c2fcadc933f713d51f46ec4dcd9b12830e0df84 (patch) | |
| tree | e0797b2db664d702f9d02dd0f45efddb2f0d7fe9 /arch/arm/mach-pxa/zylonite_pxa320.c | |
| parent | sparc64: Tighten checks in kstack_valid(). (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6 (diff) | |
| download | linux-8c2fcadc933f713d51f46ec4dcd9b12830e0df84.tar.xz linux-8c2fcadc933f713d51f46ec4dcd9b12830e0df84.zip | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/mach-pxa/zylonite_pxa320.c')
| -rw-r--r-- | arch/arm/mach-pxa/zylonite_pxa320.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/zylonite_pxa320.c b/arch/arm/mach-pxa/zylonite_pxa320.c index 60d08f23f5e4..9942bac4cf7d 100644 --- a/arch/arm/mach-pxa/zylonite_pxa320.c +++ b/arch/arm/mach-pxa/zylonite_pxa320.c @@ -209,10 +209,6 @@ void __init zylonite_pxa320_init(void) gpio_debug_led1 = mfp_to_gpio(MFP_PIN_GPIO1_2); gpio_debug_led2 = mfp_to_gpio(MFP_PIN_GPIO4_2); - /* MMC card detect & write protect for controller 0 */ - zylonite_mmc_slot[0].gpio_cd = mfp_to_gpio(MFP_PIN_GPIO1); - zylonite_mmc_slot[0].gpio_wp = mfp_to_gpio(MFP_PIN_GPIO5); - /* WM9713 IRQ */ wm9713_irq = mfp_to_gpio(MFP_PIN_GPIO15); } |