[PATCH] aoa: fix when all is built into the kernel
This patch fixes initialisation issues when all of aoa is built into the kernel by re-ordering the link order in the Makefile and making the soundbus use subsys_initcall so it is initialised earlier. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Родитель
389ba79582
Коммит
a08bc4cb09
|
@ -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/
|
||||
|
|
|
@ -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);
|
||||
|
|
Загрузка…
Ссылка в новой задаче