diff options
author | Greg KH <gregkh@linuxfoundation.org> | 2012-12-21 08:44:29 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-12-22 03:03:00 -0500 |
commit | 8baf82b368d23aed5c96b01ed7110cdccdd18725 (patch) | |
tree | d67ced86c08d6773030d4a816951fcafa4d21a16 /net/wireless/reg.c | |
parent | 03ce758e56c483bf5d0035dbd1a53ca2940a3eb0 (diff) |
CONFIG_HOTPLUG removal from networking core
CONFIG_HOTPLUG is always enabled now, so remove the unused code that was
trying to be compiled out when this option was disabled, in the
networking core.
Cc: Bill Pemberton <wfp5p@virginia.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/wireless/reg.c')
-rw-r--r-- | net/wireless/reg.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 6e5308998e30..82c4fc7c994c 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
@@ -2365,7 +2365,6 @@ int set_regdom(const struct ieee80211_regdomain *rd) | |||
2365 | return r; | 2365 | return r; |
2366 | } | 2366 | } |
2367 | 2367 | ||
2368 | #ifdef CONFIG_HOTPLUG | ||
2369 | int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env) | 2368 | int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env) |
2370 | { | 2369 | { |
2371 | if (last_request && !last_request->processed) { | 2370 | if (last_request && !last_request->processed) { |
@@ -2377,12 +2376,6 @@ int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env) | |||
2377 | 2376 | ||
2378 | return 0; | 2377 | return 0; |
2379 | } | 2378 | } |
2380 | #else | ||
2381 | int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env) | ||
2382 | { | ||
2383 | return -ENODEV; | ||
2384 | } | ||
2385 | #endif /* CONFIG_HOTPLUG */ | ||
2386 | 2379 | ||
2387 | void wiphy_regulatory_register(struct wiphy *wiphy) | 2380 | void wiphy_regulatory_register(struct wiphy *wiphy) |
2388 | { | 2381 | { |