diff options
| author | David S. Miller <davem@davemloft.net> | 2011-12-23 23:13:56 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-12-23 23:13:56 +0100 |
| commit | abb434cb0539fb355c1c921f8fd761efbbac3462 (patch) | |
| tree | 24a7d99ec161f8fd4dc9ff03c9c4cc93be883ce6 /drivers/sbus/char/uctrl.c | |
| parent | netem: loss model API sizes (diff) | |
| parent | Merge branch 'nf' of git://1984.lsi.us.es/net (diff) | |
| download | linux-abb434cb0539fb355c1c921f8fd761efbbac3462.tar.xz linux-abb434cb0539fb355c1c921f8fd761efbbac3462.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/bluetooth/l2cap_core.c
Just two overlapping changes, one added an initialization of
a local variable, and another change added a new local variable.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/sbus/char/uctrl.c')
| -rw-r--r-- | drivers/sbus/char/uctrl.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c index ebce9639a26a..0b31658ccde5 100644 --- a/drivers/sbus/char/uctrl.c +++ b/drivers/sbus/char/uctrl.c @@ -435,16 +435,6 @@ static struct platform_driver uctrl_driver = { }; -static int __init uctrl_init(void) -{ - return platform_driver_register(&uctrl_driver); -} - -static void __exit uctrl_exit(void) -{ - platform_driver_unregister(&uctrl_driver); -} +module_platform_driver(uctrl_driver); -module_init(uctrl_init); -module_exit(uctrl_exit); MODULE_LICENSE("GPL"); |