Merge branch 'docs-move' of git://git.kernel.org/pub/scm/linux/kernel/git/rdunlap...

[~andy/linux] / drivers / base / core.c

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 81b78ede37c472a594960ba14329e84c97a06c3d..bc8729d603a74834b34e75d843cbe3b1045cad50 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -400,7 +400,7 @@ static void device_remove_groups(struct device *dev,
 static int device_add_attrs(struct device *dev)
 {
        struct class *class = dev->class;
-       struct device_type *type = dev->type;
+       const struct device_type *type = dev->type;
        int error;
 
        if (class) {
@@ -440,7 +440,7 @@ static int device_add_attrs(struct device *dev)
 static void device_remove_attrs(struct device *dev)
 {
        struct class *class = dev->class;
-       struct device_type *type = dev->type;
+       const struct device_type *type = dev->type;
 
        device_remove_groups(dev, dev->groups);
 
@@ -1314,8 +1314,7 @@ EXPORT_SYMBOL_GPL(put_device);
 EXPORT_SYMBOL_GPL(device_create_file);
 EXPORT_SYMBOL_GPL(device_remove_file);
 
-struct root_device
-{
+struct root_device {
        struct device dev;
        struct module *owner;
 };