summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-11 09:22:08 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-11 09:22:08 -0800
commitb0b7b8eac33dc0f58ce9e7b7a61cf6529ee0b38c (patch)
treee5e30cc6516e0dc65181184f27b77bf71d055a18
parentc050970a257a4060e927e497a12323e961fcbadc (diff)
parent402771c786b71765c39d9a91f31b8c7b91faaa0a (diff)
downloadop-kernel-dev-b0b7b8eac33dc0f58ce9e7b7a61cf6529ee0b38c.zip
op-kernel-dev-b0b7b8eac33dc0f58ce9e7b7a61cf6529ee0b38c.tar.gz
Merge master.kernel.org:/home/rmk/linux-2.6-mmc
-rw-r--r--drivers/mmc/wbsd.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/wbsd.c
index e954b83..6166ceb 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);
OpenPOWER on IntegriCloud