diff options
| author | Andy Green <andy.green@linaro.org> | 2011-05-03 02:42:25 +0800 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-05-03 02:42:25 +0800 |
| commit | dd8c890eeb896cac3de2187f30d9adec99762dd7 (patch) | |
| tree | a04e45d24eebf14d49c3cb092f7f0d05de206644 /drivers/net/wireless/wl12xx/reg.h | |
| parent | a512fe158c9e7506df6373894a2642ee8bae09b5 (diff) | |
| parent | adc00439952f2e2e2b11d120bfe62bcb5ec93d4a (diff) | |
Merge branch 'linux-linaro-2.6.38-master' into for-ubuntu
Conflicts:
drivers/net/wireless/wl12xx/wl12xx.h
Diffstat (limited to 'drivers/net/wireless/wl12xx/reg.h')
| -rw-r--r-- | drivers/net/wireless/wl12xx/reg.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/net/wireless/wl12xx/reg.h b/drivers/net/wireless/wl12xx/reg.h index 99096077152..440a4ee9cb4 100644 --- a/drivers/net/wireless/wl12xx/reg.h +++ b/drivers/net/wireless/wl12xx/reg.h @@ -207,6 +207,8 @@ #define CHIP_ID_1271_PG10 (0x4030101) #define CHIP_ID_1271_PG20 (0x4030111) +#define CHIP_ID_1283_PG10 (0x05030101) +#define CHIP_ID_1283_PG20 (0x05030111) #define ENABLE (REGISTERS_BASE + 0x5450) @@ -452,24 +454,11 @@ #define HI_CFG_UART_TX_OUT_GPIO_14 0x00000200 #define HI_CFG_UART_TX_OUT_GPIO_7 0x00000400 -/* - * NOTE: USE_ACTIVE_HIGH compilation flag should be defined in makefile - * for platforms using active high interrupt level - */ -#ifdef USE_ACTIVE_HIGH #define HI_CFG_DEF_VAL \ (HI_CFG_UART_ENABLE | \ HI_CFG_RST232_ENABLE | \ HI_CFG_CLOCK_REQ_SELECT | \ HI_CFG_HOST_INT_ENABLE) -#else -#define HI_CFG_DEF_VAL \ - (HI_CFG_UART_ENABLE | \ - HI_CFG_RST232_ENABLE | \ - HI_CFG_CLOCK_REQ_SELECT | \ - HI_CFG_HOST_INT_ENABLE) - -#endif #define REF_FREQ_19_2 0 #define REF_FREQ_26_0 1 |