diff options
Diffstat (limited to 'drivers/mmc')
-rw-r--r-- | drivers/mmc/host/Kconfig | 2 | ||||
-rw-r--r-- | drivers/mmc/host/omap.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index b4cf691f3f64..3eb87bda14f3 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
@@ -155,7 +155,7 @@ config MMC_ATMELMCI_DMA | |||
155 | 155 | ||
156 | config MMC_IMX | 156 | config MMC_IMX |
157 | tristate "Motorola i.MX Multimedia Card Interface support" | 157 | tristate "Motorola i.MX Multimedia Card Interface support" |
158 | depends on ARCH_IMX | 158 | depends on ARCH_MX1 |
159 | help | 159 | help |
160 | This selects the Motorola i.MX Multimedia card Interface. | 160 | This selects the Motorola i.MX Multimedia card Interface. |
161 | If you have a i.MX platform with a Multimedia Card slot, | 161 | If you have a i.MX platform with a Multimedia Card slot, |
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 5570849188cc..bfa25c01c872 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c | |||
@@ -157,8 +157,6 @@ struct mmc_omap_host { | |||
157 | struct timer_list dma_timer; | 157 | struct timer_list dma_timer; |
158 | unsigned dma_len; | 158 | unsigned dma_len; |
159 | 159 | ||
160 | short power_pin; | ||
161 | |||
162 | struct mmc_omap_slot *slots[OMAP_MMC_MAX_SLOTS]; | 160 | struct mmc_omap_slot *slots[OMAP_MMC_MAX_SLOTS]; |
163 | struct mmc_omap_slot *current_slot; | 161 | struct mmc_omap_slot *current_slot; |
164 | spinlock_t slot_lock; | 162 | spinlock_t slot_lock; |