summaryrefslogtreecommitdiff
path: root/drivers/mmc/wbsd.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-02 10:39:09 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-02 10:39:09 -0700
commit1d6bebf2ecf92924492c491d9c3a72edba95f907 (patch)
tree899c6b12c76103bb6c6e83ae71ed0e0165552c95 /drivers/mmc/wbsd.h
parent86166f9846590fa46f8e24e9346d002e938a8b81 (diff)
parent3eee0d03e33b0294eb3165c96f213a8c8ee461a8 (diff)
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'drivers/mmc/wbsd.h')
-rw-r--r--drivers/mmc/wbsd.h9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/mmc/wbsd.h b/drivers/mmc/wbsd.h
index 864f30828d01..661a9f6a6e6f 100644
--- a/drivers/mmc/wbsd.h
+++ b/drivers/mmc/wbsd.h
@@ -8,13 +8,6 @@
* published by the Free Software Foundation.
*/
-const int config_ports[] = { 0x2E, 0x4E };
-const int unlock_codes[] = { 0x83, 0x87 };
-
-const int valid_ids[] = {
- 0x7112,
- };
-
#define LOCK_CODE 0xAA
#define WBSD_CONF_SWRST 0x02
@@ -187,4 +180,6 @@ struct wbsd_host
struct tasklet_struct timeout_tasklet;
struct tasklet_struct finish_tasklet;
struct tasklet_struct block_tasklet;
+
+ struct timer_list timer; /* Card detection timer */
};