diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-28 10:28:58 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-28 10:28:58 +1000 |
| commit | 54c0739947df7bfa39127524150e910ed0958af7 (patch) | |
| tree | d170ceba63d9e9d97da543ee918e9007fb51a2c2 /drivers | |
| parent | 1a7354b05076e475268847b6a5e90d11860d1f36 (diff) | |
| parent | a133e775d533c0035af627693dec288f1b1d4ffc (diff) | |
Merge commit 'arm-current/master'
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 { struct timer_list dma_timer; unsigned dma_len; - short power_pin; - struct mmc_omap_slot *slots[OMAP_MMC_MAX_SLOTS]; struct mmc_omap_slot *current_slot; spinlock_t slot_lock; |