diff options
| author | Patrick McHardy <kaber@trash.net> | 2010-04-20 10:02:01 -0400 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2010-04-20 10:02:01 -0400 |
| commit | 62910554656cdcd6b6f84a5154c4155aae4ca231 (patch) | |
| tree | dcf14004f6fd2ef7154362ff948bfeba0f3ea92d /drivers/net/wireless/ath/debug.h | |
| parent | 22265a5c3c103cf8c50be62e6c90d045eb649e6d (diff) | |
| parent | ab9304717f7624c41927f442e6b6d418b2d8b3e4 (diff) | |
Merge branch 'master' of /repos/git/net-next-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
net/ipv6/netfilter/ip6t_REJECT.c
net/netfilter/xt_limit.c
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'drivers/net/wireless/ath/debug.h')
| -rw-r--r-- | drivers/net/wireless/ath/debug.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/ath/debug.h b/drivers/net/wireless/ath/debug.h index 8263633c003c..873bf526e11f 100644 --- a/drivers/net/wireless/ath/debug.h +++ b/drivers/net/wireless/ath/debug.h | |||
| @@ -59,6 +59,7 @@ enum ATH_DEBUG { | |||
| 59 | ATH_DBG_PS = 0x00000800, | 59 | ATH_DBG_PS = 0x00000800, |
| 60 | ATH_DBG_HWTIMER = 0x00001000, | 60 | ATH_DBG_HWTIMER = 0x00001000, |
| 61 | ATH_DBG_BTCOEX = 0x00002000, | 61 | ATH_DBG_BTCOEX = 0x00002000, |
| 62 | ATH_DBG_WMI = 0x00004000, | ||
| 62 | ATH_DBG_ANY = 0xffffffff | 63 | ATH_DBG_ANY = 0xffffffff |
| 63 | }; | 64 | }; |
| 64 | 65 | ||