diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:18:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:18:09 -0400 |
| commit | da1f136c26d45c57e8b2d711bf17a6e5ec4de2d1 (patch) | |
| tree | 82483083e7d06663222654066823d565567e4b0a /drivers/mmc/wbsd.h | |
| parent | 64c4813d9ea0d646a0652bd9dcc5b40db6ddce69 (diff) | |
| parent | 1656fa579e44691a860b095016eee910bc0b2793 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'drivers/mmc/wbsd.h')
| -rw-r--r-- | drivers/mmc/wbsd.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mmc/wbsd.h b/drivers/mmc/wbsd.h index 661a9f6a6e6f..8af43549f5d5 100644 --- a/drivers/mmc/wbsd.h +++ b/drivers/mmc/wbsd.h | |||
| @@ -181,5 +181,6 @@ struct wbsd_host | |||
| 181 | struct tasklet_struct finish_tasklet; | 181 | struct tasklet_struct finish_tasklet; |
| 182 | struct tasklet_struct block_tasklet; | 182 | struct tasklet_struct block_tasklet; |
| 183 | 183 | ||
| 184 | struct timer_list timer; /* Card detection timer */ | 184 | struct timer_list detect_timer; /* Card detection timer */ |
| 185 | struct timer_list ignore_timer; /* Ignore detection timer */ | ||
| 185 | }; | 186 | }; |