summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb/siano/smssdio.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-06-01 05:02:59 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-01 05:02:59 -0300
commitdd4931dd692b5001b3ccb4d7d74c1d4481f3a7be (patch)
tree159af14f7ff781703660d7f12a142b90ef64e52c /linux/drivers/media/dvb/siano/smssdio.c
parent3d5f82276e18a37806603a52b23d18c8b60b5d01 (diff)
parentd7709cc1d93ee6c75fc6e421ae5e8646aff438a7 (diff)
downloadmediapointer-dvb-s2-dd4931dd692b5001b3ccb4d7d74c1d4481f3a7be.tar.gz
mediapointer-dvb-s2-dd4931dd692b5001b3ccb4d7d74c1d4481f3a7be.tar.bz2
merge: http://linuxtv.org/hg/~awalls/cx18-av-core
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");