diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 19:54:53 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 20:01:40 (GMT) |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /drivers/staging/rtl8187se/r8180_rtl8225.h | |
| parent | 34e84f39a27d059a3e6ec6e8b94aafa702e6f220 (diff) | |
| parent | 9173a8ef24a6b1b8031507b35b8ffe5f85a87692 (diff) | |
| download | linux-fsl-qoriq-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz | |
Merge branch 'master' into for-linus
Diffstat (limited to 'drivers/staging/rtl8187se/r8180_rtl8225.h')
| -rw-r--r-- | drivers/staging/rtl8187se/r8180_rtl8225.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/staging/rtl8187se/r8180_rtl8225.h b/drivers/staging/rtl8187se/r8180_rtl8225.h index 458de66..ed35db5 100644 --- a/drivers/staging/rtl8187se/r8180_rtl8225.h +++ b/drivers/staging/rtl8187se/r8180_rtl8225.h @@ -19,23 +19,13 @@ #define RTL8225_ANAPARAM_SLEEP 0xa00bab59 #define RTL8225_ANAPARAM2_SLEEP 0x840dec11 -#ifdef CONFIG_RTL8185B void rtl8225z2_rf_init(struct net_device *dev); void rtl8225z2_rf_set_chan(struct net_device *dev,short ch); void rtl8225z2_rf_close(struct net_device *dev); -void rtl8225_host_pci_init(struct net_device *dev); -void rtl8225_host_usb_init(struct net_device *dev); - -void write_rtl8225(struct net_device *dev, u8 adr, u16 data); void RF_WriteReg(struct net_device *dev, u8 offset, u32 data); u32 RF_ReadReg(struct net_device *dev, u8 offset); -#endif -void rtl8225_rf_init(struct net_device *dev); -void rtl8225_rf_set_chan(struct net_device *dev,short ch); -void rtl8225_rf_close(struct net_device *dev); -void rtl8225_rf_sleep(struct net_device *dev); -void rtl8225_rf_wakeup(struct net_device *dev); + void rtl8180_set_mode(struct net_device *dev,int mode); void rtl8180_set_mode(struct net_device *dev,int mode); bool SetZebraRFPowerState8185(struct net_device *dev,RT_RF_POWER_STATE eRFPowerState); |