aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/wireless/ath5k/base.c8
-rw-r--r--include/linux/pci_ids.h2
2 files changed, 8 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
index b3f41acb9065..368db944f11f 100644
--- a/drivers/net/wireless/ath5k/base.c
+++ b/drivers/net/wireless/ath5k/base.c
@@ -2626,8 +2626,12 @@ ath5k_init_leds(struct ath5k_softc *sc)
2626 sc->led_pin = 1; 2626 sc->led_pin = 1;
2627 sc->led_on = 1; /* active high */ 2627 sc->led_on = 1; /* active high */
2628 } 2628 }
2629 /* Pin 3 on Foxconn chips used in Acer Aspire One (0x105b:e008) */ 2629 /*
2630 if (pdev->subsystem_vendor == PCI_VENDOR_ID_FOXCONN) { 2630 * Pin 3 on Foxconn chips used in Acer Aspire One (0x105b:e008) and
2631 * in emachines notebooks with AMBIT subsystem.
2632 */
2633 if (pdev->subsystem_vendor == PCI_VENDOR_ID_FOXCONN ||
2634 pdev->subsystem_vendor == PCI_VENDOR_ID_AMBIT) {
2631 __set_bit(ATH_STAT_LEDSOFT, sc->status); 2635 __set_bit(ATH_STAT_LEDSOFT, sc->status);
2632 sc->led_pin = 3; 2636 sc->led_pin = 3;
2633 sc->led_on = 0; /* active low */ 2637 sc->led_on = 0; /* active low */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 5b7a48c1d616..b7697c934a49 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1967,6 +1967,8 @@
1967 1967
1968#define PCI_VENDOR_ID_SAMSUNG 0x144d 1968#define PCI_VENDOR_ID_SAMSUNG 0x144d
1969 1969
1970#define PCI_VENDOR_ID_AMBIT 0x1468
1971
1970#define PCI_VENDOR_ID_MYRICOM 0x14c1 1972#define PCI_VENDOR_ID_MYRICOM 0x14c1
1971 1973
1972#define PCI_VENDOR_ID_TITAN 0x14D2 1974#define PCI_VENDOR_ID_TITAN 0x14D2