summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/p54/p54usb.h
diff options
context:
space:
mode:
authorRicardo Ribalda Delgado2014-11-24 11:19:51 +0100
committerJohn W. Linville2014-11-24 22:51:24 +0100
commita831f20b6d6460640b83644d1c1df6e7e8ca9f68 (patch)
treeaa2fa8dab3d21e8e9472ffe6c187a4fd52da9e2b /drivers/net/wireless/p54/p54usb.h
parentrtlwifi: update RCR register in rtl_op_configure_filter() (diff)
downloadkernel-qcow2-linux-a831f20b6d6460640b83644d1c1df6e7e8ca9f68.tar.gz
kernel-qcow2-linux-a831f20b6d6460640b83644d1c1df6e7e8ca9f68.tar.xz
kernel-qcow2-linux-a831f20b6d6460640b83644d1c1df6e7e8ca9f68.zip
wireless/p54: Remove duplicated net2280 header
The usb gadget driver net2280 has exported a header file with the register definition of the net2280 chip. Remove the custom/duplicated header file in favor of that header file in include/linux Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/p54/p54usb.h')
-rw-r--r--drivers/net/wireless/p54/p54usb.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54/p54usb.h b/drivers/net/wireless/p54/p54usb.h
index d273be7272b9..a5f5f0fea3bd 100644
--- a/drivers/net/wireless/p54/p54usb.h
+++ b/drivers/net/wireless/p54/p54usb.h
@@ -16,7 +16,7 @@
/* for isl3886 register definitions used on ver 1 devices */
#include "p54pci.h"
-#include "net2280.h"
+#include <linux/usb/net2280.h>
/* pci */
#define NET2280_BASE 0x10000000
@@ -93,6 +93,17 @@ enum net2280_op_type {
NET2280_DEV_CFG_U16 = 0x0883
};
+struct net2280_reg_write {
+ __le16 port;
+ __le32 addr;
+ __le32 val;
+} __packed;
+
+struct net2280_reg_read {
+ __le16 port;
+ __le32 addr;
+} __packed;
+
#define P54U_FW_BLOCK 2048
#define X2_SIGNATURE "x2 "