aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/ath5k/base.c7
-rw-r--r--include/linux/pci_ids.h2
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index 88618645a7e4..fdf7733e76e1 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -2596,6 +2596,13 @@ ath5k_init_leds(struct ath5k_softc *sc)
2596 sc->led_pin = 1; 2596 sc->led_pin = 1;
2597 sc->led_on = 1; /* active high */ 2597 sc->led_on = 1; /* active high */
2598 } 2598 }
2599 /* Pin 3 on Foxconn chips used in Acer Aspire One (0x105b:e008) */
2600 if (pdev->subsystem_vendor == PCI_VENDOR_ID_FOXCONN) {
2601 __set_bit(ATH_STAT_LEDSOFT, sc->status);
2602 sc->led_pin = 3;
2603 sc->led_on = 0; /* active low */
2604 }
2605
2599 if (!test_bit(ATH_STAT_LEDSOFT, sc->status)) 2606 if (!test_bit(ATH_STAT_LEDSOFT, sc->status))
2600 goto out; 2607 goto out;
2601 2608
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 302423afa136..5b7a48c1d616 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -834,6 +834,8 @@
834#define PCI_DEVICE_ID_PROMISE_20276 0x5275 834#define PCI_DEVICE_ID_PROMISE_20276 0x5275
835#define PCI_DEVICE_ID_PROMISE_20277 0x7275 835#define PCI_DEVICE_ID_PROMISE_20277 0x7275
836 836
837#define PCI_VENDOR_ID_FOXCONN 0x105b
838
837#define PCI_VENDOR_ID_UMC 0x1060 839#define PCI_VENDOR_ID_UMC 0x1060
838#define PCI_DEVICE_ID_UMC_UM8673F 0x0101 840#define PCI_DEVICE_ID_UMC_UM8673F 0x0101
839#define PCI_DEVICE_ID_UMC_UM8886BF 0x673a 841#define PCI_DEVICE_ID_UMC_UM8886BF 0x673a