git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-25 00:52:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'v3.3-rc6' into next

Browse Source
This commit is contained in:
Dmitry Torokhov
2012-03-09 10:55:17 -08:00
parent 104a5f3cad 192cfd5877
commit b675b3667f
10542 changed files with 476630 additions and 307857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/input/serio/at32psif.c
View File

@@ -358,7 +358,19 @@ static struct platform_driver psif_driver = {
.pm = &psif_pm_ops,
},
};
module_platform_driver(psif_driver);
static int __init psif_init(void)
{
return platform_driver_probe(&psif_driver, psif_probe);
}
static void __exit psif_exit(void)
{
platform_driver_unregister(&psif_driver);
}
module_init(psif_init);
module_exit(psif_exit);
MODULE_AUTHOR("Hans-Christian Egtvedt <egtvedt@samfundet.no>");
MODULE_DESCRIPTION("Atmel AVR32 PSIF PS/2 driver");