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/r8192S_rtl8225.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/r8192S_rtl8225.h')
| -rw-r--r-- | drivers/staging/rtl8192su/r8192S_rtl8225.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/drivers/staging/rtl8192su/r8192S_rtl8225.h b/drivers/staging/rtl8192su/r8192S_rtl8225.h deleted file mode 100644 index 8a64728..0000000 --- a/drivers/staging/rtl8192su/r8192S_rtl8225.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - This is part of the rtl8180-sa2400 driver - released under the GPL (See file COPYING for details). - Copyright (c) 2005 Andrea Merello <andreamrl@tiscali.it> - - This files contains programming code for the rtl8256 - radio frontend. - - *Many* thanks to Realtek Corp. for their great support! - -*/ - -#ifndef RTL8225H -#define RTL8225H - -#ifdef RTL8190P -#define RTL819X_TOTAL_RF_PATH 4 //for 90P -#else -#define RTL819X_TOTAL_RF_PATH 2 //for 8192U -#endif -extern void PHY_SetRF0222DBandwidth(struct net_device* dev , HT_CHANNEL_WIDTH Bandwidth); //20M or 40M; -extern void PHY_SetRF8225Bandwidth( struct net_device* dev , HT_CHANNEL_WIDTH Bandwidth); -extern bool PHY_RF8225_Config(struct net_device* dev ); -extern void phy_RF8225_Config_HardCode(struct net_device* dev); -extern bool phy_RF8225_Config_ParaFile(struct net_device* dev); -extern void PHY_SetRF8225CckTxPower(struct net_device* dev ,u8 powerlevel); -extern void PHY_SetRF8225OfdmTxPower(struct net_device* dev ,u8 powerlevel); -extern void PHY_SetRF0222DOfdmTxPower(struct net_device* dev ,u8 powerlevel); -extern void PHY_SetRF0222DCckTxPower(struct net_device* dev ,u8 powerlevel); -#endif |
