summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/siano/smssdio.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-06-06 08:15:26 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-06 08:15:26 -0300
commita54e4ff7ad973562ecb961a02ea8da66e2334aef (patch)
treefe475f0216d4971e771364a4fce63e759fd858ac /linux/drivers/media/dvb/siano/smssdio.c
parentab62c90c3f2b6debe4c45c66aa08b5a65039e40e (diff)
parentd336dddd42e43b5465cd58b5a4812011805905df (diff)
downloadmediapointer-dvb-s2-a54e4ff7ad973562ecb961a02ea8da66e2334aef.tar.gz
mediapointer-dvb-s2-a54e4ff7ad973562ecb961a02ea8da66e2334aef.tar.bz2
merge: http://kernellabs.com/hg/~dheitmueller/misc-fixes-2
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/dvb/siano/smssdio.c')
-rw-r--r--linux/drivers/media/dvb/siano/smssdio.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/siano/smssdio.c b/linux/drivers/media/dvb/siano/smssdio.c
index 4f8fa59a9..dfaa49a53 100644
--- a/linux/drivers/media/dvb/siano/smssdio.c
+++ b/linux/drivers/media/dvb/siano/smssdio.c
@@ -332,7 +332,7 @@ static struct sdio_driver smssdio_driver = {
/* Module functions */
/*******************************************************************/
-int smssdio_register(void)
+int smssdio_module_init(void)
{
int ret = 0;
@@ -344,11 +344,14 @@ int smssdio_register(void)
return ret;
}
-void smssdio_unregister(void)
+void smssdio_module_exit(void)
{
sdio_unregister_driver(&smssdio_driver);
}
+module_init(smssdio_module_init);
+module_exit(smssdio_module_exit);
+
MODULE_DESCRIPTION("Siano SMS1xxx SDIO driver");
MODULE_AUTHOR("Pierre Ossman");
MODULE_LICENSE("GPL");