summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-04-24 22:15:48 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-04-24 22:15:48 +0100
commit0df283639d7f6aa8948516aabf0c48b4b486cda1 (patch)
tree241c67ce212acd91a8cdeb22cced135e7f5e275e /drivers
parent9f5a691253924fd033a58c6b1fed57bb0a4eccf4 (diff)
parent535ff672e3589a38f60567314bc2ae15b9ab2604 (diff)
downloadop-kernel-dev-0df283639d7f6aa8948516aabf0c48b4b486cda1.zip
op-kernel-dev-0df283639d7f6aa8948516aabf0c48b4b486cda1.tar.gz
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.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c
index 5570849..bfa25c0 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;
OpenPOWER on IntegriCloud