diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-02-06 19:26:39 (GMT) |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-02-06 19:26:39 (GMT) |
| commit | 8926574c4d0055ca4c4a02d1f6b2c249d01a0621 (patch) | |
| tree | 0c02c3cfff77e868d605246204add4664503b2af /drivers/net/wireless/rtlwifi/debug.c | |
| parent | c056b734e54e12f38f34a2583a4824e6cecc16c1 (diff) | |
| parent | b0302aba812bcc39291cdab9ad7e37008f352a91 (diff) | |
| download | linux-fsl-qoriq-8926574c4d0055ca4c4a02d1f6b2c249d01a0621.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/rtlwifi/rtl8192se/sw.c
Diffstat (limited to 'drivers/net/wireless/rtlwifi/debug.c')
| -rw-r--r-- | drivers/net/wireless/rtlwifi/debug.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/rtlwifi/debug.c b/drivers/net/wireless/rtlwifi/debug.c index 1b5cb71..bdda9b2 100644 --- a/drivers/net/wireless/rtlwifi/debug.c +++ b/drivers/net/wireless/rtlwifi/debug.c @@ -1,6 +1,6 @@ /****************************************************************************** * - * Copyright(c) 2009-2010 Realtek Corporation. + * Copyright(c) 2009-2012 Realtek Corporation. * * Tmis program is free software; you can redistribute it and/or modify it * under the terms of version 2 of the GNU General Public License as @@ -28,6 +28,8 @@ #include "wifi.h" +#include <linux/moduleparam.h> + void rtl_dbgp_flag_init(struct ieee80211_hw *hw) { struct rtl_priv *rtlpriv = rtl_priv(hw); |