diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 02:14:45 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 02:14:45 -0400 |
| commit | d26f0528d588e596955bf296a609afe52eafc099 (patch) | |
| tree | 314f7a5637d5517a19f29d64a17e3459505def8f /drivers/platform | |
| parent | b963bd39c9000328f6ce4f12aa52abbb0c68ee91 (diff) | |
| parent | df43176c934f2bc01f7615a6e20a4b8e77dcdd11 (diff) | |
Merge branch 'misc-2.6.32' into release
Conflicts:
drivers/pci/dmar.c
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/platform')
| -rw-r--r-- | drivers/platform/x86/hp-wmi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index af04f5b049d..c2842171cec 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c @@ -507,7 +507,7 @@ static int __exit hp_wmi_bios_remove(struct platform_device *device) } if (bluetooth_rfkill) { rfkill_unregister(bluetooth_rfkill); - rfkill_destroy(wifi_rfkill); + rfkill_destroy(bluetooth_rfkill); } if (wwan_rfkill) { rfkill_unregister(wwan_rfkill); |