Merge branch 'mmci' into amba

[~andy/linux] / drivers / char / hw_random / nomadik-rng.c

diff --git a/drivers/char/hw_random/nomadik-rng.c b/drivers/char/hw_random/nomadik-rng.c
index 3d3c1e6703b404e18944394b373452357e85a82b..96de0249e595812f778786380cac78866b3b408e 100644 (file)
--- a/drivers/char/hw_random/nomadik-rng.c
+++ b/drivers/char/hw_random/nomadik-rng.c
@@ -107,17 +107,6 @@ static struct amba_driver nmk_rng_driver = {
        .id_table = nmk_rng_ids,
 };
 
-static int __init nmk_rng_init(void)
-{
-       return amba_driver_register(&nmk_rng_driver);
-}
-
-static void __devexit nmk_rng_exit(void)
-{
-       amba_driver_unregister(&nmk_rng_driver);
-}
-
-module_init(nmk_rng_init);
-module_exit(nmk_rng_exit);
+module_amba_driver(nmk_rng_driver);
 
 MODULE_LICENSE("GPL");