diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-26 00:16:16 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-26 00:16:16 +0400 |
| commit | db4148da2cc84c31419b5e3ae3115ac6e11817a1 (patch) | |
| tree | 72d7d99cd7a4903e017169e0ae8e2b37027129c6 /drivers/net/wireless/ath5k/reg.h | |
| parent | ef40a685311bef053dedd833a72dffaf25669dda (diff) | |
| parent | 8d09a5e1c36d0dec5728e6c8b0bb5412de09b27b (diff) | |
| download | linux-db4148da2cc84c31419b5e3ae3115ac6e11817a1.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/ath5k/reg.h')
| -rw-r--r-- | drivers/net/wireless/ath5k/reg.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath5k/reg.h b/drivers/net/wireless/ath5k/reg.h index a98832364448..410f99a6d616 100644 --- a/drivers/net/wireless/ath5k/reg.h +++ b/drivers/net/wireless/ath5k/reg.h @@ -820,8 +820,6 @@ #define AR5K_RESET_CTL_MAC 0x00000004 /* MAC reset (PCU+Baseband ?) [5210] */ #define AR5K_RESET_CTL_PHY 0x00000008 /* PHY reset [5210] */ #define AR5K_RESET_CTL_PCI 0x00000010 /* PCI Core reset (interrupts etc) */ -#define AR5K_RESET_CTL_CHIP (AR5K_RESET_CTL_PCU | AR5K_RESET_CTL_DMA | \ - AR5K_RESET_CTL_MAC | AR5K_RESET_CTL_PHY) /* * Sleep control register |