diff options
Diffstat (limited to 'sound/aoa')
| -rw-r--r-- | sound/aoa/Makefile | 4 | ||||
| -rw-r--r-- | sound/aoa/soundbus/core.c | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/sound/aoa/Makefile b/sound/aoa/Makefile index d8de3e7..a8c037f 100644 --- a/sound/aoa/Makefile +++ b/sound/aoa/Makefile @@ -1,4 +1,4 @@ obj-$(CONFIG_SND_AOA) += core/ -obj-$(CONFIG_SND_AOA) += codecs/ -obj-$(CONFIG_SND_AOA) += fabrics/ obj-$(CONFIG_SND_AOA_SOUNDBUS) += soundbus/ +obj-$(CONFIG_SND_AOA) += fabrics/ +obj-$(CONFIG_SND_AOA) += codecs/ diff --git a/sound/aoa/soundbus/core.c b/sound/aoa/soundbus/core.c index abe84a7..47b3e37 100644 --- a/sound/aoa/soundbus/core.c +++ b/sound/aoa/soundbus/core.c @@ -194,16 +194,6 @@ static struct bus_type soundbus_bus_type = { .dev_attrs = soundbus_dev_attrs, }; -static int __init soundbus_init(void) -{ - return bus_register(&soundbus_bus_type); -} - -static void __exit soundbus_exit(void) -{ - bus_unregister(&soundbus_bus_type); -} - int soundbus_add_one(struct soundbus_dev *dev) { static int devcount; @@ -246,5 +236,15 @@ void soundbus_unregister_driver(struct soundbus_driver *drv) } EXPORT_SYMBOL_GPL(soundbus_unregister_driver); -module_init(soundbus_init); +static int __init soundbus_init(void) +{ + return bus_register(&soundbus_bus_type); +} + +static void __exit soundbus_exit(void) +{ + bus_unregister(&soundbus_bus_type); +} + +subsys_initcall(soundbus_init); module_exit(soundbus_exit); |