diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-09 22:53:32 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-05-10 13:09:57 -0400 |
commit | 2046782524aebe7a5683ec62868a0d26c7d889b3 (patch) | |
tree | 27aacc31679800d6365830fd967af122099cbff2 /drivers/staging/rtl8712/xmit_linux.c | |
parent | be9a12040f6d1a29b9a7fdec89058edca0dc2c4d (diff) |
staging: wean rtl8712 off of its ancient duplicate of ip.h
This driver should not be carrying around ancient copies of
headers like <linux/ip.h> for its own use. Mapping it onto
the mainline one uncovers no build issues.
Cc: Larry Finger <Larry.Finger@lwfinger.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'drivers/staging/rtl8712/xmit_linux.c')
-rw-r--r-- | drivers/staging/rtl8712/xmit_linux.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/rtl8712/xmit_linux.c b/drivers/staging/rtl8712/xmit_linux.c index d27f652127b1..c6943c54d507 100644 --- a/drivers/staging/rtl8712/xmit_linux.c +++ b/drivers/staging/rtl8712/xmit_linux.c @@ -29,13 +29,12 @@ #define _XMIT_OSDEP_C_ #include <linux/usb.h> +#include <linux/ip.h> #include <linux/if_ether.h> #include "osdep_service.h" #include "drv_types.h" - -#include "ip.h" #include "rtl871x_byteorder.h" #include "wifi.h" #include "mlme_osdep.h" |