diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-04-24 17:15:48 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-04-24 17:15:48 -0400 |
| commit | 0df283639d7f6aa8948516aabf0c48b4b486cda1 (patch) | |
| tree | 241c67ce212acd91a8cdeb22cced135e7f5e275e /drivers | |
| parent | 9f5a691253924fd033a58c6b1fed57bb0a4eccf4 (diff) | |
| parent | 535ff672e3589a38f60567314bc2ae15b9ab2604 (diff) | |
Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/host/omap.c | 2 |
1 files changed, 0 insertions, 2 deletions
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; |