Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

diff --combined drivers/net/wireless/ipw2200.c
index 846a7d05185133ac67dfd6f900c614b9c9172b77,9509fd2a25f873ecb1c5f1c56cc1801b0afbf20b..36e8d2f6e7b4d2b3ba712fb066685d4917446913
--- 1/drivers/net/wireless/ipw2200.c
--- 2/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@@ -305,9 -305,10 +305,10 @@@ static inline void ipw_write_reg32(stru
  #define _ipw_write8(ipw, ofs, val) writeb((val), (ipw)->hw_base + (ofs))
  
  /* 8-bit direct write (for low 4K of SRAM/regs), with debug wrapper */
- #define ipw_write8(ipw, ofs, val) \
+ #define ipw_write8(ipw, ofs, val) do { \
   IPW_DEBUG_IO("%s %d: write_direct8(0x%08X, 0x%08X)\n", __FILE__, __LINE__, (u32)(ofs), (u32)(val)); \
-  _ipw_write8(ipw, ofs, val)
+  _ipw_write8(ipw, ofs, val); \
+  } while (0)
  
  /* 16-bit direct write (low 4K) */
  #define _ipw_write16(ipw, ofs, val) writew((val), (ipw)->hw_base + (ofs))
@@@ -11946,7 -11947,7 +11947,7 @@@ module_param(auto_create, int, 0444)
  MODULE_PARM_DESC(auto_create, "auto create adhoc network (default on)");
  
  module_param(led, int, 0444);
 -MODULE_PARM_DESC(led, "enable led control on some systems (default 0 off)\n");
 +MODULE_PARM_DESC(led, "enable led control on some systems (default 0 off)");
  
  module_param(debug, int, 0444);
  MODULE_PARM_DESC(debug, "debug output mask");