diff --git a/[refs] b/[refs]
index 88f1c48e64bb..cfd4dcde3aec 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44b6eb263783bee7f619d6c5ae48a4306756a797
+refs/heads/master: 71769d737a2887aa9608e89deaca4185e44a0bca
diff --git a/trunk/drivers/staging/rtl8192e/Makefile b/trunk/drivers/staging/rtl8192e/Makefile
index 80c2c8360b4f..299131c256e6 100644
--- a/trunk/drivers/staging/rtl8192e/Makefile
+++ b/trunk/drivers/staging/rtl8192e/Makefile
@@ -1,5 +1,4 @@
 ccflags-y += -DCONFIG_PM_RTL
-ccflags-y += -DHAVE_NET_DEVICE_OPS
 
 r8192e_pci-objs :=		\
 	rtl_core.o		\
diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.c b/trunk/drivers/staging/rtl8192e/rtl_core.c
index 5ad96649f407..4868091c3a42 100644
--- a/trunk/drivers/staging/rtl8192e/rtl_core.c
+++ b/trunk/drivers/staging/rtl8192e/rtl_core.c
@@ -2839,7 +2839,6 @@ irqreturn_type rtl8192_interrupt(int irq, void *netdev, struct pt_regs *regs)
 /****************************************************************************
 	---------------------------- PCI_STUFF---------------------------
 *****************************************************************************/
-#ifdef HAVE_NET_DEVICE_OPS
 static const struct net_device_ops rtl8192_netdev_ops = {
 	.ndo_open = rtl8192_open,
 	.ndo_stop = rtl8192_close,
@@ -2851,7 +2850,6 @@ static const struct net_device_ops rtl8192_netdev_ops = {
 	.ndo_change_mtu = eth_change_mtu,
 	.ndo_start_xmit = rtllib_xmit,
 };
-#endif
 
 static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
 			const struct pci_device_id *id)
@@ -2938,17 +2936,7 @@ static int __devinit rtl8192_pci_probe(struct pci_dev *pdev,
 	dev->irq = pdev->irq;
 	priv->irq = 0;
 
-#ifdef HAVE_NET_DEVICE_OPS
 	dev->netdev_ops = &rtl8192_netdev_ops;
-#else
-	dev->open = rtl8192_open;
-	dev->stop = rtl8192_close;
-	dev->tx_timeout = rtl8192_tx_timeout;
-	dev->do_ioctl = rtl8192_ioctl;
-	dev->set_multicast_list = r8192_set_multicast;
-	dev->set_mac_address = r8192_set_mac_adr;
-	dev->hard_start_xmit = rtllib_xmit;
-#endif
 
 	dev->wireless_handlers = (struct iw_handler_def *)
 				 &r8192_wx_handlers_def;