OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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:
Benjamin Herrenschmidt 2006-07-10 04:44:35 -07:00 committed by Linus Torvalds
parent 389ba79582
commit a08bc4cb09
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/aoa/Makefile
View File

@ -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/

22
sound/aoa/soundbus/core.c
View File

@ -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);