diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
| commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
| tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /drivers/mmc/wbsd.c | |
| parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
| parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'drivers/mmc/wbsd.c')
| -rw-r--r-- | drivers/mmc/wbsd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 0c41d4b41a65..8b487ed1069c 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c | |||
| @@ -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) |