diff options
| author | Mike McCormack <mikem@ring3k.org> | 2011-07-11 08:56:20 +0900 |
|---|---|---|
| committer | Larry Finger <Larry.Finger@lwfinger.net> | 2011-08-23 20:02:27 -0500 |
| commit | cb76215448947ddcc133c4b1c2ff2d4a77e851e0 (patch) | |
| tree | fd624f3b0be586b9a1e182b0e5fa68f40db34132 /drivers/staging/rtl8192e/r8192E_firmware.c | |
| parent | 1ec3e2f255c597c4bff693d0b045a49b12c5bb90 (diff) | |
| download | op-kernel-dev-cb76215448947ddcc133c4b1c2ff2d4a77e851e0.zip op-kernel-dev-cb76215448947ddcc133c4b1c2ff2d4a77e851e0.tar.gz | |
rtl8192e: Remove extra ifdefs
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Mike McCormack <mikem@ring3k.org>
Diffstat (limited to 'drivers/staging/rtl8192e/r8192E_firmware.c')
| -rw-r--r-- | drivers/staging/rtl8192e/r8192E_firmware.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/drivers/staging/rtl8192e/r8192E_firmware.c b/drivers/staging/rtl8192e/r8192E_firmware.c index 6d49029..8c77d13 100644 --- a/drivers/staging/rtl8192e/r8192E_firmware.c +++ b/drivers/staging/rtl8192e/r8192E_firmware.c @@ -17,19 +17,11 @@ * wlanfae <wlanfae@realtek.com> ******************************************************************************/ -#if (defined(RTL8192E) || defined(RTL8190P)) - #include "rtl_core.h" #include "r8192E_hw.h" -#ifdef RTL8190P -#include "r8190P_hwimg.h" -#elif defined RTL8192E #include "r8192E_hwimg.h" -#endif #include "r8192E_firmware.h" -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) #include <linux/firmware.h> -#endif extern void firmware_init_param(struct net_device *dev) { @@ -308,17 +300,12 @@ bool init_firmware(struct net_device *dev) RT_TRACE(COMP_FIRMWARE, "PlatformInitFirmware: undefined firmware state\n"); } -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) && defined(USE_FW_SOURCE_IMG_FILE) priv->firmware_source = FW_SOURCE_IMG_FILE; -#else - priv->firmware_source = FW_SOURCE_HEADER_FILE; -#endif for (init_step = starting_state; init_step <= FW_INIT_STEP2_DATA; init_step++) { if (rst_opt == OPT_SYSTEM_RESET) { switch (priv->firmware_source) { case FW_SOURCE_IMG_FILE: { -#if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,0) && defined(USE_FW_SOURCE_IMG_FILE) if (pfirmware->firmware_buf_size[init_step] == 0) { const char *fw_name[3] = { "RTL8192E/boot.img", "RTL8192E/main.img", @@ -352,7 +339,6 @@ bool init_firmware(struct net_device *dev) } mapped_file = pfirmware->firmware_buf[init_step]; file_length = pfirmware->firmware_buf_size[init_step]; -#endif break; } case FW_SOURCE_HEADER_FILE: @@ -393,4 +379,3 @@ download_firmware_fail: return rt_status; } -#endif |
