From dd0ceb0ce47c03660a77524a3464cce0954f7a69 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Thu, 14 Sep 2006 11:23:28 +0200 Subject: [PATCH] --- yaml --- r: 41176 b: refs/heads/master c: a87cb2ac4a78c590583b52a3ed196adc6c25b6c9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/core.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 88528d98ca8e..7214a889ea1f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 99ef3ef8d5f2f5b5312627127ad63df27c0d0d05 +refs/heads/master: a87cb2ac4a78c590583b52a3ed196adc6c25b6c9 diff --git a/trunk/drivers/base/core.c b/trunk/drivers/base/core.c index b565b7e9d40b..f544adc5a5e2 100644 --- a/trunk/drivers/base/core.c +++ b/trunk/drivers/base/core.c @@ -154,20 +154,24 @@ static int dev_uevent(struct kset *kset, struct kobject *kobj, char **envp, "MINOR=%u", MINOR(dev->devt)); } +#ifdef CONFIG_SYSFS_DEPRECATED /* add bus name (same as SUBSYSTEM, deprecated) */ if (dev->bus) add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length, "PHYSDEVBUS=%s", dev->bus->name); +#endif /* add driver name (PHYSDEV* values are deprecated)*/ if (dev->driver) { add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length, "DRIVER=%s", dev->driver->name); +#ifdef CONFIG_SYSFS_DEPRECATED add_uevent_var(envp, num_envp, &i, buffer, buffer_size, &length, "PHYSDEVDRIVER=%s", dev->driver->name); +#endif } /* terminate, set to next free slot, shrink available space */