diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 00:51:31 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-17 00:51:31 -0400 |
| commit | a2e30e529a48ef4e106e405f91cf4ae525bb01c4 (patch) | |
| tree | 2def96ef17c0672c30f1a10287552978bf1d0b1c /drivers/mmc/wbsd.c | |
| parent | edb3366703224d5d8df573ae698ccd6b488dc743 (diff) | |
| parent | 2ad56496627630ebc99f06af5f81ca23e17e014e (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'drivers/mmc/wbsd.c')
| -rw-r--r-- | drivers/mmc/wbsd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 0c41d4b41a65..974f2f36bdbe 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c | |||
| @@ -42,7 +42,7 @@ | |||
| 42 | #include "wbsd.h" | 42 | #include "wbsd.h" |
| 43 | 43 | ||
| 44 | #define DRIVER_NAME "wbsd" | 44 | #define DRIVER_NAME "wbsd" |
| 45 | #define DRIVER_VERSION "1.2" | 45 | #define DRIVER_VERSION "1.3" |
| 46 | 46 | ||
| 47 | #ifdef CONFIG_MMC_DEBUG | 47 | #ifdef CONFIG_MMC_DEBUG |
| 48 | #define DBG(x...) \ | 48 | #define DBG(x...) \ |
| @@ -1053,7 +1053,7 @@ static void wbsd_detect_card(unsigned long data) | |||
| 1053 | * Tasklets | 1053 | * Tasklets |
| 1054 | */ | 1054 | */ |
| 1055 | 1055 | ||
| 1056 | inline static struct mmc_data* wbsd_get_data(struct wbsd_host* host) | 1056 | static inline struct mmc_data* wbsd_get_data(struct wbsd_host* host) |
| 1057 | { | 1057 | { |
| 1058 | WARN_ON(!host->mrq); | 1058 | WARN_ON(!host->mrq); |
| 1059 | if (!host->mrq) | 1059 | if (!host->mrq) |