Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

Conflicts:
	net/mac80211/pm.c

1 files changed, 0 insertions, 3 deletions

diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c
index 50d9019de2be..fe171fad12cf 100644
--- a/drivers/platform/x86/hp-wmi.c
+++ b/drivers/platform/x86/hp-wmi.c
@@ -434,7 +434,6 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
                 wifi_rfkill->name = "hp-wifi";
                 wifi_rfkill->state = hp_wmi_wifi_state();
                 wifi_rfkill->toggle_radio = hp_wmi_wifi_set;
-                wifi_rfkill->user_claim_unsupported = 1;
                 err = rfkill_register(wifi_rfkill);
                 if (err)
                         goto add_sysfs_error;
@@ -446,7 +445,6 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
                 bluetooth_rfkill->name = "hp-bluetooth";
                 bluetooth_rfkill->state = hp_wmi_bluetooth_state();
                 bluetooth_rfkill->toggle_radio = hp_wmi_bluetooth_set;
-                bluetooth_rfkill->user_claim_unsupported = 1;
                 err = rfkill_register(bluetooth_rfkill);
                 if (err)
                         goto register_bluetooth_error;
@@ -457,7 +455,6 @@ static int __init hp_wmi_bios_setup(struct platform_device *device)
                 wwan_rfkill->name = "hp-wwan";
                 wwan_rfkill->state = hp_wmi_wwan_state();
                 wwan_rfkill->toggle_radio = hp_wmi_wwan_set;
-                wwan_rfkill->user_claim_unsupported = 1;
                 err = rfkill_register(wwan_rfkill);
                 if (err)
                         goto register_wwan_err;