diff options
author | Corentin Chary <corentincj@iksaif.net> | 2009-06-25 13:25:42 +0200 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-06-26 00:23:41 -0400 |
commit | 3cd530b5aaffd27b231f9717730f2f6684c00bda (patch) | |
tree | 05a17a7f1bb4f2aafd9bf653979df0c0b864c990 /drivers | |
parent | dbfa3ba90dfe353a56e107cff5bce9fb7976f06f (diff) | |
download | linux-stable-3cd530b5aaffd27b231f9717730f2f6684c00bda.tar.gz linux-stable-3cd530b5aaffd27b231f9717730f2f6684c00bda.tar.bz2 linux-stable-3cd530b5aaffd27b231f9717730f2f6684c00bda.zip |
eeepc-laptop: add rfkill support for the 3G modem in Eee PC 901 Go
Signed-off-by: Janne Grunau <j@jannau.net>
Signed-off-by: Corentin Chary <corentincj@iksaif.net>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/platform/x86/eeepc-laptop.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/platform/x86/eeepc-laptop.c b/drivers/platform/x86/eeepc-laptop.c index f5d8473ea66f..ec560f16d720 100644 --- a/drivers/platform/x86/eeepc-laptop.c +++ b/drivers/platform/x86/eeepc-laptop.c @@ -141,6 +141,7 @@ struct eeepc_hotk { u16 *keycode_map; struct rfkill *wlan_rfkill; struct rfkill *bluetooth_rfkill; + struct rfkill *wwan3g_rfkill; struct hotplug_slot *hotplug_slot; }; @@ -1023,6 +1024,8 @@ static void eeepc_rfkill_exit(void) rfkill_unregister(ehotk->wlan_rfkill); if (ehotk->bluetooth_rfkill) rfkill_unregister(ehotk->bluetooth_rfkill); + if (ehotk->wwan3g_rfkill) + rfkill_unregister(ehotk->wwan3g_rfkill); if (ehotk->hotplug_slot) pci_hp_deregister(ehotk->hotplug_slot); } @@ -1107,6 +1110,13 @@ static int eeepc_rfkill_init(struct device *dev) if (result && result != -ENODEV) goto exit; + result = eeepc_new_rfkill(&ehotk->wwan3g_rfkill, + "eeepc-wwan3g", dev, + RFKILL_TYPE_WWAN, CM_ASL_3G); + + if (result && result != -ENODEV) + goto exit; + result = eeepc_setup_pci_hotplug(); /* * If we get -EBUSY then something else is handling the PCI hotplug - |