diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-19 13:19:16 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-21 13:27:16 -0800 |
| commit | 2bd6a021e887c675116ff8cdacc3af49999a2224 (patch) | |
| tree | 0459f13c700834c12a9d22edbd059d9b3fd4083d /drivers/usb/core/usb.c | |
| parent | d3cec81fc929b6edc43bd42725929685359adef7 (diff) | |
| download | blackbird-op-linux-2bd6a021e887c675116ff8cdacc3af49999a2224.tar.gz blackbird-op-linux-2bd6a021e887c675116ff8cdacc3af49999a2224.zip | |
usb-core: 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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core/usb.c')
| -rw-r--r-- | drivers/usb/core/usb.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/usb/core/usb.c b/drivers/usb/core/usb.c index 7d3de09a82e4..f81b92572735 100644 --- a/drivers/usb/core/usb.c +++ b/drivers/usb/core/usb.c @@ -233,7 +233,6 @@ static void usb_release_dev(struct device *dev) kfree(udev); } -#ifdef CONFIG_HOTPLUG static int usb_dev_uevent(struct device *dev, struct kobj_uevent_env *env) { struct usb_device *usb_dev; @@ -249,14 +248,6 @@ static int usb_dev_uevent(struct device *dev, struct kobj_uevent_env *env) return 0; } -#else - -static int usb_dev_uevent(struct device *dev, struct kobj_uevent_env *env) -{ - return -ENODEV; -} -#endif /* CONFIG_HOTPLUG */ - #ifdef CONFIG_PM /* USB device Power-Management thunks. |
