Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / net / wireless / reg.c

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 93ab840957a045bfb4333bad63aa65977dedf8d2..98532c00242dd4a1a134e12f388a340434b38c04 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2265,7 +2265,6 @@ int set_regdom(const struct ieee80211_regdomain *rd)
        return r;
 }
 
-#ifdef CONFIG_HOTPLUG
 int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
        struct regulatory_request *lr;
@@ -2285,12 +2284,6 @@ int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
                                      alpha2[0], alpha2[1]);
        return 0;
 }
-#else
-int reg_device_uevent(struct device *dev, struct kobj_uevent_env *env)
-{
-       return -ENODEV;
-}
-#endif /* CONFIG_HOTPLUG */
 
 void wiphy_regulatory_register(struct wiphy *wiphy)
 {