diff options
author | David S. Miller <davem@davemloft.net> | 2010-02-28 00:57:28 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-28 00:57:28 -0800 |
commit | 46976c042ba1ff59253f2f7a513099175c24794e (patch) | |
tree | a7af3f1c3ef2a2d430c49fb774ab744c296a2285 /drivers/bluetooth/btmrvl_sdio.c | |
parent | 024c378f0b719d43b01b875caefa19f2612e103a (diff) | |
parent | f6e623a65cb301088bd04794043e82bfc996c512 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'drivers/bluetooth/btmrvl_sdio.c')
-rw-r--r-- | drivers/bluetooth/btmrvl_sdio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index 57d965b7f52..94f1f55f81f 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c @@ -976,7 +976,7 @@ static struct sdio_driver bt_mrvl_sdio = { .remove = btmrvl_sdio_remove, }; -static int btmrvl_sdio_init_module(void) +static int __init btmrvl_sdio_init_module(void) { if (sdio_register_driver(&bt_mrvl_sdio) != 0) { BT_ERR("SDIO Driver Registration Failed"); @@ -989,7 +989,7 @@ static int btmrvl_sdio_init_module(void) return 0; } -static void btmrvl_sdio_exit_module(void) +static void __exit btmrvl_sdio_exit_module(void) { /* Set the flag as user is removing this module. */ user_rmmod = 1; |