diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-08-16 19:40:23 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-08-16 19:40:23 +0400 |
commit | d3ec3a1fd08f705d1b319db4113590944bcde749 (patch) | |
tree | 598a0da59e027b455f11beab24a96ef1e56fbbcb /drivers/net/wireless/mwifiex/sdio.h | |
parent | 8f898fbbe5ee5e20a77c4074472a1fd088dc47d1 (diff) | |
parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
download | linux-d3ec3a1fd08f705d1b319db4113590944bcde749.tar.xz |
Merge tag 'v3.11-rc5' into sched/core
Merge Linux 3.11-rc5, to pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/wireless/mwifiex/sdio.h')
-rw-r--r-- | drivers/net/wireless/mwifiex/sdio.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/mwifiex/sdio.h b/drivers/net/wireless/mwifiex/sdio.h index 6d51dfdd8251..532ae0ac4dfb 100644 --- a/drivers/net/wireless/mwifiex/sdio.h +++ b/drivers/net/wireless/mwifiex/sdio.h @@ -92,9 +92,6 @@ /* Host Control Registers : Download host interrupt mask */ #define DN_LD_HOST_INT_MASK (0x2U) -/* Disable Host interrupt mask */ -#define HOST_INT_DISABLE 0xff - /* Host Control Registers : Host interrupt status */ #define HOST_INTSTATUS_REG 0x03 /* Host Control Registers : Upload host interrupt status */ |