diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-28 09:44:56 -0700 |
commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 (patch) | |
tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 /drivers/staging/rtl8192su/r8192SU_HWImg.h | |
parent | 81280572ca6f54009edfa4deee563e8678784218 (diff) | |
parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 (diff) | |
download | op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.zip op-kernel-dev-e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7.tar.gz |
Merge 'staging-next' to Linus's tree
This merges the staging-next tree to Linus's tree and resolves
some conflicts that were present due to changes in other trees that were
affected by files here.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/rtl8192su/r8192SU_HWImg.h')
-rw-r--r-- | drivers/staging/rtl8192su/r8192SU_HWImg.h | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/drivers/staging/rtl8192su/r8192SU_HWImg.h b/drivers/staging/rtl8192su/r8192SU_HWImg.h deleted file mode 100644 index 69a66c3..0000000 --- a/drivers/staging/rtl8192su/r8192SU_HWImg.h +++ /dev/null @@ -1,60 +0,0 @@ -/****************************************************************************** - * Copyright(c) 2008 - 2010 Realtek Corporation. All rights reserved. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * The full GNU General Public License is included in this distribution in the - * file called LICENSE. - * - * Contact Information: - * wlanfae <wlanfae@realtek.com> -******************************************************************************/ -#ifndef __INC_HAL8192SU_FW_IMG_H -#define __INC_HAL8192SU_FW_IMG_H - -#include <linux/types.h> - -/*Created on 2009/ 3/ 6, 5:29*/ - -#define MainArrayLength 1 -extern u8 Rtl8192SUFwMainArray[MainArrayLength]; -#define DataArrayLength 1 -extern u8 Rtl8192SUFwDataArray[DataArrayLength]; -#define PHY_REG_2T2RArrayLength 372 -extern u32 Rtl8192SUPHY_REG_2T2RArray[PHY_REG_2T2RArrayLength]; -#define PHY_REG_1T2RArrayLength 1 -extern u32 Rtl8192SUPHY_REG_1T2RArray[PHY_REG_1T2RArrayLength]; -#define PHY_ChangeTo_1T1RArrayLength 48 -extern u32 Rtl8192SUPHY_ChangeTo_1T1RArray[PHY_ChangeTo_1T1RArrayLength]; -#define PHY_ChangeTo_1T2RArrayLength 45 -extern u32 Rtl8192SUPHY_ChangeTo_1T2RArray[PHY_ChangeTo_1T2RArrayLength]; -#define PHY_ChangeTo_2T2RArrayLength 45 -extern u32 Rtl8192SUPHY_ChangeTo_2T2RArray[PHY_ChangeTo_2T2RArrayLength]; -#define PHY_REG_Array_PGLength 84 -extern u32 Rtl8192SUPHY_REG_Array_PG[PHY_REG_Array_PGLength]; -#define RadioA_1T_ArrayLength 202 -extern u32 Rtl8192SURadioA_1T_Array[RadioA_1T_ArrayLength]; -#define RadioB_ArrayLength 22 -extern u32 Rtl8192SURadioB_Array[RadioB_ArrayLength]; -#define RadioA_to1T_ArrayLength 2 -extern u32 Rtl8192SURadioA_to1T_Array[RadioA_to1T_ArrayLength]; -#define RadioA_to2T_ArrayLength 2 -extern u32 Rtl8192SURadioA_to2T_Array[RadioA_to2T_ArrayLength]; -#define RadioB_GM_ArrayLength 16 -extern u32 Rtl8192SURadioB_GM_Array[RadioB_GM_ArrayLength]; -#define MAC_2T_ArrayLength 106 -extern u32 Rtl8192SUMAC_2T_Array[MAC_2T_ArrayLength]; -#define MACPHY_Array_PGLength 1 -extern u32 Rtl8192SUMACPHY_Array_PG[MACPHY_Array_PGLength]; -#define AGCTAB_ArrayLength 320 -extern u32 Rtl8192SUAGCTAB_Array[AGCTAB_ArrayLength]; - -#endif - |