Merge branch 'master' into next

[sfrench/cifs-2.6.git] / drivers / of / platform.c

diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index ca09a63a64db7bdf66a03f0da0069518615e3d6f..298de0f95d70d24d15727ab7b54a28d438854ec2 100644 (file)
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -17,6 +17,8 @@
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
 
+extern struct device_attribute of_platform_device_attrs[];
+
 static int of_platform_bus_match(struct device *dev, struct device_driver *drv)
 {
        struct of_device *of_dev = to_of_device(dev);
@@ -103,6 +105,7 @@ int of_bus_type_init(struct bus_type *bus, const char *name)
        bus->suspend = of_platform_device_suspend;
        bus->resume = of_platform_device_resume;
        bus->shutdown = of_platform_device_shutdown;
+       bus->dev_attrs = of_platform_device_attrs;
        return bus_register(bus);
 }