diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:19:15 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-21 12:42:25 -0800 |
| commit | 2c9e9fdc0b2d55886609f0503fb91f96dfec6948 (patch) | |
| tree | c8221303b8eff71fb61966b16b8b52ad7b6bfbe7 | |
| parent | 82849a93aad04c5a438d811081341b245fdade8c (diff) | |
w1: remove CONFIG_HOTPLUG ifdefs
Remove conditional code based on CONFIG_HOTPLUG being false. It's
always on now in preparation of it going away as an option.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Cc: Evgeniy Polyakov <zbr@ioremap.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/w1/w1.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 1a574370d2cd..7994d933f040 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -551,7 +551,6 @@ void w1_destroy_master_attributes(struct w1_master *master) sysfs_remove_group(&master->dev.kobj, &w1_master_defattr_group); } -#ifdef CONFIG_HOTPLUG static int w1_uevent(struct device *dev, struct kobj_uevent_env *env) { struct w1_master *md = NULL; @@ -587,12 +586,6 @@ static int w1_uevent(struct device *dev, struct kobj_uevent_env *env) end: return err; } -#else -static int w1_uevent(struct device *dev, struct kobj_uevent_env *env) -{ - return 0; -} -#endif static int __w1_attach_slave_device(struct w1_slave *sl) { |