From 13ea4cb5d13631bd007b5e94bc3315fb46ab95bf Mon Sep 17 00:00:00 2001 From: Tulio Magno Quites Machado Filho Date: Sun, 25 Jan 2009 23:54:25 +0100 Subject: [PATCH] --- yaml --- r: 134269 b: refs/heads/master c: f677d7702d48b7b3dfcce3b2c0db601dbee0aa24 h: refs/heads/master i: 134267: a327a673a700bf4fae94833cdc666ebe09bf232d v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath5k/base.c | 8 ++++++-- trunk/include/linux/pci_ids.h | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 869d1c3db56c..4d3a019bd7be 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 060210f938d8aa0b9d795588a2274cd67ba9d6a4 +refs/heads/master: f677d7702d48b7b3dfcce3b2c0db601dbee0aa24 diff --git a/trunk/drivers/net/wireless/ath5k/base.c b/trunk/drivers/net/wireless/ath5k/base.c index b3f41acb9065..368db944f11f 100644 --- a/trunk/drivers/net/wireless/ath5k/base.c +++ b/trunk/drivers/net/wireless/ath5k/base.c @@ -2626,8 +2626,12 @@ 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) { + /* + * Pin 3 on Foxconn chips used in Acer Aspire One (0x105b:e008) and + * in emachines notebooks with AMBIT subsystem. + */ + if (pdev->subsystem_vendor == PCI_VENDOR_ID_FOXCONN || + pdev->subsystem_vendor == PCI_VENDOR_ID_AMBIT) { __set_bit(ATH_STAT_LEDSOFT, sc->status); sc->led_pin = 3; sc->led_on = 0; /* active low */ diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h index 5b7a48c1d616..b7697c934a49 100644 --- a/trunk/include/linux/pci_ids.h +++ b/trunk/include/linux/pci_ids.h @@ -1967,6 +1967,8 @@ #define PCI_VENDOR_ID_SAMSUNG 0x144d +#define PCI_VENDOR_ID_AMBIT 0x1468 + #define PCI_VENDOR_ID_MYRICOM 0x14c1 #define PCI_VENDOR_ID_TITAN 0x14D2