rtl8192e: Remove extra ifdefs

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Mike McCormack <mikem@ring3k.org>

diff --cc drivers/staging/rtl8192e/internal.h
Simple merge

diff --cc drivers/staging/rtl8192e/r8192E_cmdpkt.c
Simple merge

diff --cc drivers/staging/rtl8192e/r8192E_firmware.c
Simple merge

diff --cc drivers/staging/rtl8192e/r8192E_phy.c
Simple merge

diff --cc drivers/staging/rtl8192e/rtl819x_HTProc.c
Simple merge

diff --cc drivers/staging/rtl8192e/rtl819x_Qos.h
Simple merge

diff --cc drivers/staging/rtl8192e/rtl819x_TSProc.c
Simple merge

diff --cc drivers/staging/rtl8192e/rtl_cam.c
Simple merge

diff --cc drivers/staging/rtl8192e/rtl_core.c
Simple merge

diff --cc drivers/staging/rtl8192e/rtl_core.h
Simple merge

diff --cc drivers/staging/rtl8192e/rtl_debug.c
Simple merge

diff --cc drivers/staging/rtl8192e/rtl_debug.h
Simple merge

diff --cc drivers/staging/rtl8192e/rtl_dm.c
Simple merge

diff --cc drivers/staging/rtl8192e/rtl_ethtool.c
Simple merge

diff --cc drivers/staging/rtl8192e/rtl_pci.c
Simple merge

diff --cc drivers/staging/rtl8192e/rtl_pm.c
Simple merge

diff --cc drivers/staging/rtl8192e/rtl_pm.h
Simple merge

diff --cc drivers/staging/rtl8192e/rtl_ps.c
Simple merge

diff --cc drivers/staging/rtl8192e/rtllib.h
Simple merge

diff --cc drivers/staging/rtl8192e/rtllib_crypt.h
Simple merge

diff --cc drivers/staging/rtl8192e/rtllib_crypt_ccmp.c
Simple merge

diff --cc drivers/staging/rtl8192e/rtllib_crypt_tkip.c
Simple merge

diff --cc drivers/staging/rtl8192e/rtllib_crypt_wep.c
Simple merge

diff --cc drivers/staging/rtl8192e/rtllib_rx.c
Simple merge

diff --cc drivers/staging/rtl8192e/rtllib_softmac.c
Simple merge

diff --cc drivers/staging/rtl8192e/rtllib_softmac_wx.c
Simple merge