Merge branch 'for-linus' of git://neil.brown.name/md

[linux-2.6] / include / linux / device.h

diff --git a/include/linux/device.h b/include/linux/device.h
index a701c1b5184c441546a402805f1f785d2f3fe9d4..4d8372d135df8df6d4f648b009faaa5d4d315538 100644 (file)
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -358,6 +358,7 @@ struct device {
 
        struct kobject kobj;
        char    bus_id[BUS_ID_SIZE];    /* position on parent bus */
+       const char              *init_name; /* initial name of the device */
        struct device_type      *type;
        unsigned                uevent_suppress:1;