From 563bae2ddbc3eaa8e587f0cb1c5c77e4c7194db2 Mon Sep 17 00:00:00 2001 From: Luciano Coelho Date: Fri, 12 Jun 2009 14:15:33 +0300 Subject: [PATCH] --- yaml --- r: 158799 b: refs/heads/master c: 27797d68f70b28e77e6d183910dc7b3d7505105d h: refs/heads/master i: 158797: ec4de34a1c24ab48e12ef9ed53627bdd18e48085 158795: 95cbc21b21e470afad87ad604995c4fac3246830 158791: ce5c119d8267f2b0c63d1b0999794bdef9de696f 158783: 48bb42b30cb4df643cb9fa42847d759a968cd4d1 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/wl12xx/main.c | 7 +++++++ trunk/drivers/net/wireless/wl12xx/wl12xx.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bcf5c259a761..15ed02bc8ef7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d1c38398fa8cd478a229b4428fb511f813376e8 +refs/heads/master: 27797d68f70b28e77e6d183910dc7b3d7505105d diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c index 950c4257f421..73232db2b466 100644 --- a/trunk/drivers/net/wireless/wl12xx/main.c +++ b/trunk/drivers/net/wireless/wl12xx/main.c @@ -196,6 +196,13 @@ static int wl12xx_chip_wakeup(struct wl12xx *wl) break; case CHIP_ID_1271_PG10: + wl12xx_warning("chip id 0x%x (1271 PG10) support is obsolete", + wl->chip.id); + break; + case CHIP_ID_1271_PG20: + wl12xx_debug(DEBUG_BOOT, "chip id 0x%x (1271 PG20)", + wl->chip.id); + break; case CHIP_ID_1251_PG10: case CHIP_ID_1251_PG11: default: diff --git a/trunk/drivers/net/wireless/wl12xx/wl12xx.h b/trunk/drivers/net/wireless/wl12xx/wl12xx.h index 32f62a699b2a..c1d00c01f7d3 100644 --- a/trunk/drivers/net/wireless/wl12xx/wl12xx.h +++ b/trunk/drivers/net/wireless/wl12xx/wl12xx.h @@ -412,5 +412,6 @@ int wl12xx_plt_stop(struct wl12xx *wl); #define CHIP_ID_1251_PG11 (0x7020101) #define CHIP_ID_1251_PG12 (0x7030101) #define CHIP_ID_1271_PG10 (0x4030101) +#define CHIP_ID_1271_PG20 (0x4030111) #endif