From 93968d7551f1ff1806f70cdacf1bd997ef30836e Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Wed, 9 Nov 2005 23:21:06 +0000 Subject: [MMC] Use __devexit_p in wbsd wbsd_*_remove() is declared as __devexit but __devexit_p isn't used when taking their addresses. Signed-off-by: Pierre Ossman Signed-off-by: Russell King --- drivers/mmc/wbsd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index e954b8354fe..46a084a529c 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c @@ -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 */ -- cgit v1.2.3 From de1d09e3e2ac576ee1e257b7d141c3cae4ce5fa9 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Wed, 9 Nov 2005 23:21:49 +0000 Subject: [MMC] Add MODULE_AUTHOR to wbsd 'cause I'm in it for the chicks. ;) Signed-off-by: Pierre Ossman Signed-off-by: Russell King --- drivers/mmc/wbsd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 46a084a529c..9d055812c72 100644 --- a/drivers/mmc/wbsd.c +++ b/drivers/mmc/wbsd.c @@ -2127,6 +2127,7 @@ module_param(irq, uint, 0444); module_param(dma, int, 0444); MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Pierre Ossman "); MODULE_DESCRIPTION("Winbond W83L51xD SD/MMC card interface driver"); MODULE_VERSION(DRIVER_VERSION); -- cgit v1.2.3 From 402771c786b71765c39d9a91f31b8c7b91faaa0a Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Wed, 9 Nov 2005 23:22:27 +0000 Subject: [MMC] wbsd version 1.5 New kernel, new patches, new version. Signed-off-by: Pierre Ossman Signed-off-by: Russell King --- drivers/mmc/wbsd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c index 9d055812c72..6166ceb9571 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...) \ -- cgit v1.2.3