928e893a11
The removed patches were applied upstream. The type of the RT2X00_LIB_EEPROM config option was changed to bool, because boolean is an invalid value and the new kconfig system complained about this. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
18 lines
695 B
Diff
18 lines
695 B
Diff
--- a/drivers/net/wireless/broadcom/b43/main.c
|
|
+++ b/drivers/net/wireless/broadcom/b43/main.c
|
|
@@ -2884,6 +2884,14 @@ static int b43_gpio_init(struct b43_wlde
|
|
} else if (dev->dev->chip_id == 0x5354) {
|
|
/* Don't allow overtaking buttons GPIOs */
|
|
set &= 0x2; /* 0x2 is LED GPIO on BCM5354 */
|
|
+ } else if (dev->dev->chip_id == BCMA_CHIP_ID_BCM4716 ||
|
|
+ dev->dev->chip_id == BCMA_CHIP_ID_BCM47162 ||
|
|
+ dev->dev->chip_id == BCMA_CHIP_ID_BCM5356 ||
|
|
+ dev->dev->chip_id == BCMA_CHIP_ID_BCM5357 ||
|
|
+ dev->dev->chip_id == BCMA_CHIP_ID_BCM53572) {
|
|
+ /* just use gpio 0 and 1 for 2.4 GHz wifi led */
|
|
+ set &= 0x3;
|
|
+ mask &= 0x3;
|
|
}
|
|
|
|
if (0 /* FIXME: conditional unknown */ ) {
|