diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 09:22:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 09:22:08 -0800 |
| commit | b0b7b8eac33dc0f58ce9e7b7a61cf6529ee0b38c (patch) | |
| tree | e5e30cc6516e0dc65181184f27b77bf71d055a18 /drivers | |
| parent | [PATCH] TCP: fix vegas build (diff) | |
| parent | [MMC] wbsd version 1.5 (diff) | |
| download | linux-dev-b0b7b8eac33dc0f58ce9e7b7a61cf6529ee0b38c.tar.xz linux-dev-b0b7b8eac33dc0f58ce9e7b7a61cf6529ee0b38c.zip | |
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mmc/wbsd.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index e954b8354fef..6166ceb95717 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c @@ -42,7 +42,7 @@ #include "wbsd.h" #define DRIVER_NAME "wbsd" -#define DRIVER_VERSION "1.4" +#define DRIVER_VERSION "1.5" #ifdef CONFIG_MMC_DEBUG #define DBG(x...) \ @@ -2042,7 +2042,7 @@ static struct device_driver wbsd_driver = { .name = DRIVER_NAME, .bus = &platform_bus_type, .probe = wbsd_probe, - .remove = wbsd_remove, + .remove = __devexit_p(wbsd_remove), .suspend = wbsd_suspend, .resume = wbsd_resume, @@ -2054,7 +2054,7 @@ static struct pnp_driver wbsd_pnp_driver = { .name = DRIVER_NAME, .id_table = pnp_dev_table, .probe = wbsd_pnp_probe, - .remove = wbsd_pnp_remove, + .remove = __devexit_p(wbsd_pnp_remove), }; #endif /* CONFIG_PNP */ @@ -2127,6 +2127,7 @@ module_param(irq, uint, 0444); module_param(dma, int, 0444); MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Pierre Ossman <drzeus@drzeus.cx>"); MODULE_DESCRIPTION("Winbond W83L51xD SD/MMC card interface driver"); MODULE_VERSION(DRIVER_VERSION); |