From 06e5b0b39e817b497d6e9e5fa31456b5d0421485 Mon Sep 17 00:00:00 2001 From: Bob Copeland Date: Thu, 1 Jan 2009 15:01:44 -0500 Subject: [PATCH] --- yaml --- r: 134071 b: refs/heads/master c: 63649b6cf0a964582af2b4d4734e28ca90ec8f5c h: refs/heads/master i: 134069: b6ea9b7520beebc162e68ec1dd587a65a2284da2 134067: 3d600b40541cc92cb012275f717e3a990f92ed48 134063: ed4b4631f51a41fbffd33602e6dd3b0460f6dcbc v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath5k/base.c | 7 +++++++ trunk/include/linux/pci_ids.h | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bc707ba8ef92..e6bc8dccd7bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2b8d4e2eea711b6dfe1878ff3c94ebe757656f6d +refs/heads/master: 63649b6cf0a964582af2b4d4734e28ca90ec8f5c diff --git a/trunk/drivers/net/wireless/ath5k/base.c b/trunk/drivers/net/wireless/ath5k/base.c index 88618645a7e4..fdf7733e76e1 100644 --- a/trunk/drivers/net/wireless/ath5k/base.c +++ b/trunk/drivers/net/wireless/ath5k/base.c @@ -2596,6 +2596,13 @@ ath5k_init_leds(struct ath5k_softc *sc) sc->led_pin = 1; sc->led_on = 1; /* active high */ } + /* Pin 3 on Foxconn chips used in Acer Aspire One (0x105b:e008) */ + if (pdev->subsystem_vendor == PCI_VENDOR_ID_FOXCONN) { + __set_bit(ATH_STAT_LEDSOFT, sc->status); + sc->led_pin = 3; + sc->led_on = 0; /* active low */ + } + if (!test_bit(ATH_STAT_LEDSOFT, sc->status)) goto out; diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index 302423afa136..5b7a48c1d616 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -834,6 +834,8 @@ #define PCI_DEVICE_ID_PROMISE_20276 0x5275 #define PCI_DEVICE_ID_PROMISE_20277 0x7275 +#define PCI_VENDOR_ID_FOXCONN 0x105b + #define PCI_VENDOR_ID_UMC 0x1060 #define PCI_DEVICE_ID_UMC_UM8673F 0x0101 #define PCI_DEVICE_ID_UMC_UM8886BF 0x673a