diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /drivers/mmc | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge with Linus' 2.6 tree
Diffstat (limited to 'drivers/mmc')
| -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) |