diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-09 06:12:55 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-09 06:12:55 +0400 |
| commit | ca371d2854d48c0c22e7aa031df182f96dc85820 (patch) | |
| tree | 1c62be8b4da0bfc82fa7ffa1ad5b0e958266cbd1 /drivers/net/irda/pxaficp_ir.c | |
| parent | 0d376945d0bc0a8f8e00861d506b10e42e8af372 (diff) | |
| parent | a0e86bd4252519321b0d102dc4ed90557aa7bee9 (diff) | |
| download | linux-ca371d2854d48c0c22e7aa031df182f96dc85820.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into sh-latest
Conflicts:
arch/arm/mach-shmobile/clock-sh73a0.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/net/irda/pxaficp_ir.c')
| -rw-r--r-- | drivers/net/irda/pxaficp_ir.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/net/irda/pxaficp_ir.c b/drivers/net/irda/pxaficp_ir.c index d0851dfa0378..81d5275a15e2 100644 --- a/drivers/net/irda/pxaficp_ir.c +++ b/drivers/net/irda/pxaficp_ir.c @@ -966,18 +966,7 @@ static struct platform_driver pxa_ir_driver = { .resume = pxa_irda_resume, }; -static int __init pxa_irda_init(void) -{ - return platform_driver_register(&pxa_ir_driver); -} - -static void __exit pxa_irda_exit(void) -{ - platform_driver_unregister(&pxa_ir_driver); -} - -module_init(pxa_irda_init); -module_exit(pxa_irda_exit); +module_platform_driver(pxa_ir_driver); MODULE_LICENSE("GPL"); MODULE_ALIAS("platform:pxa2xx-ir"); |