# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.573.92.17 -> 1.573.92.18 # drivers/base/hotplug.c 1.3 -> 1.4 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 02/10/08 greg@kroah.com 1.573.92.18 # driver core: rename DEVICE to DEVPATH for /sbin/hotplug call to prevent conflict with USB # -------------------------------------------- # diff -Nru a/drivers/base/hotplug.c b/drivers/base/hotplug.c --- a/drivers/base/hotplug.c Tue Oct 8 15:53:38 2002 +++ b/drivers/base/hotplug.c Tue Oct 8 15:53:38 2002 @@ -97,7 +97,7 @@ scratch += sprintf (scratch, "ACTION=%s", action) + 1; envp [i++] = scratch; - scratch += sprintf (scratch, "DEVICE=%s", dev_path) + 1; + scratch += sprintf (scratch, "DEVPATH=%s", dev_path) + 1; if (dev->bus->hotplug) { /* have the bus specific function add its stuff */