---

yaml --- r: 304635 b: refs/heads/master c: be9a120 h: refs/heads/master i: 304633: 16d7692 304631: bd5c53c v: v3
git-mirror · May 10, 2012 · a283fdd · a283fdd
1 parent fe2c216
commit a283fdd
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 145 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e545f6d165ad0180b0d04fe1291f6f6268047ff
+refs/heads/master: be9a12040f6d1a29b9a7fdec89058edca0dc2c4d
diff --git a/trunk/drivers/staging/rtl8712/if_ether.h b/trunk/drivers/staging/rtl8712/if_ether.h
diff --git a/trunk/drivers/staging/rtl8712/rtl8712_recv.c b/trunk/drivers/staging/rtl8712/rtl8712_recv.c
@@ -28,12 +28,13 @@
 
 #define _RTL8712_RECV_C_
 
+#include <linux/if_ether.h>
+
 #include "osdep_service.h"
 #include "drv_types.h"
 #include "recv_osdep.h"
 #include "mlme_osdep.h"
 #include "ip.h"
-#include "if_ether.h"
 #include "ethernet.h"
 #include "usb_ops.h"
 #include "wifi.h"

diff --git a/trunk/drivers/staging/rtl8712/rtl871x_recv.c b/trunk/drivers/staging/rtl8712/rtl871x_recv.c
@@ -29,14 +29,14 @@
 #define _RTL871X_RECV_C_
 
 #include <linux/slab.h>
+#include <linux/if_ether.h>
 #include <linux/kmemleak.h>
 
 #include "osdep_service.h"
 #include "drv_types.h"
 #include "recv_osdep.h"
 #include "mlme_osdep.h"
 #include "ip.h"
-#include "if_ether.h"
 #include "ethernet.h"
 #include "usb_ops.h"
 #include "wifi.h"

diff --git a/trunk/drivers/staging/rtl8712/xmit_linux.c b/trunk/drivers/staging/rtl8712/xmit_linux.c
@@ -29,12 +29,12 @@
 #define _XMIT_OSDEP_C_
 
 #include <linux/usb.h>
+#include <linux/if_ether.h>
 
 #include "osdep_service.h"
 #include "drv_types.h"
 
 
-#include "if_ether.h"
 #include "ip.h"
 #include "rtl871x_byteorder.h"
 #include "wifi.h"