1 files changed, 7 insertions, 7 deletions

diff --git a/include/linux/device.h b/include/linux/device.h
index 17cbc6db67b4..0cdee78e5ce1 100644
--- a/include/linux/device.h
+++ b/include/linux/device.h
@@ -47,8 +47,8 @@ struct bus_type {
         struct driver_attribute * drv_attrs;
 
         int             (*match)(struct device * dev, struct device_driver * drv);
-        int             (*hotplug) (struct device *dev, char **envp, 
-                                    int num_envp, char *buffer, int buffer_size);
+        int             (*uevent)(struct device *dev, char **envp,
+                                  int num_envp, char *buffer, int buffer_size);
         int             (*suspend)(struct device * dev, pm_message_t state);
         int             (*resume)(struct device * dev);
 };
@@ -151,7 +151,7 @@ struct class {
         struct class_attribute          * class_attrs;
         struct class_device_attribute   * class_dev_attrs;
 
-        int     (*hotplug)(struct class_device *dev, char **envp, 
+        int     (*uevent)(struct class_device *dev, char **envp,
                            int num_envp, char *buffer, int buffer_size);
 
         void    (*release)(struct class_device *dev);
@@ -209,9 +209,9 @@ extern int class_device_create_file(struct class_device *,
  * set, this will be called instead of the class specific release function.
  * Only use this if you want to override the default release function, like
  * when you are nesting class_device structures.
- * @hotplug: pointer to a hotplug function for this struct class_device.  If
- * set, this will be called instead of the class specific hotplug function.
- * Only use this if you want to override the default hotplug function, like
+ * @uevent: pointer to a uevent function for this struct class_device.  If
+ * set, this will be called instead of the class specific uevent function.
+ * Only use this if you want to override the default uevent function, like
  * when you are nesting class_device structures.
  */
 struct class_device {
@@ -227,7 +227,7 @@ struct class_device {
         struct class_device     *parent;        /* parent of this child device, if there is one */
 
         void    (*release)(struct class_device *dev);
-        int     (*hotplug)(struct class_device *dev, char **envp,
+        int     (*uevent)(struct class_device *dev, char **envp,
                            int num_envp, char *buffer, int buffer_size);
         char    class_id[BUS_ID_SIZE];  /* unique to this class */
 };