Merge tag 'sound-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai...

[uclinux-h8/linux.git] / sound / aoa / soundbus / core.c

diff --git a/sound/aoa/soundbus/core.c b/sound/aoa/soundbus/core.c
index 7487eb7..3edf736 100644 (file)
--- a/sound/aoa/soundbus/core.c
+++ b/sound/aoa/soundbus/core.c
@@ -150,6 +150,8 @@ static int soundbus_device_resume(struct device * dev)
 
 #endif /* CONFIG_PM */
 
+/* soundbus_dev_attrs is declared in sysfs.c */
+ATTRIBUTE_GROUPS(soundbus_dev);
 static struct bus_type soundbus_bus_type = {
        .name           = "aoa-soundbus",
        .probe          = soundbus_probe,
@@ -160,7 +162,7 @@ static struct bus_type soundbus_bus_type = {
        .suspend        = soundbus_device_suspend,
        .resume         = soundbus_device_resume,
 #endif
-       .dev_attrs      = soundbus_dev_attrs,
+       .dev_groups     = soundbus_dev_groups,
 };
 
 int soundbus_add_one(struct soundbus_dev *dev)