projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6365ba6
)
net: wangxun: Remove macro that is redefined
author
mengyuanlou
<mengyuanlou@net-swift.com>
Wed, 15 Mar 2023 09:18:46 +0000
(17:18 +0800)
committer
Jakub Kicinski
<kuba@kernel.org>
Sat, 18 Mar 2023 05:30:28 +0000
(22:30 -0700)
Remove PCI_VENDOR_ID_WANGXUN which is redefined in
drivers/pci/quirks.
Signed-off-by: mengyuanlou <mengyuanlou@net-swift.com>
Link:
https://lore.kernel.org/r/20230315091846.17314-1-mengyuanlou@net-swift.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/ethernet/wangxun/libwx/wx_type.h
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/wangxun/libwx/wx_type.h
b/drivers/net/ethernet/wangxun/libwx/wx_type.h
index 2b9efd13c500ddb9506f4dc1fa7861000b57dd2b..2bec5b1bc196d60c68364f349a52b47c6658ded3 100644
(file)
--- a/
drivers/net/ethernet/wangxun/libwx/wx_type.h
+++ b/
drivers/net/ethernet/wangxun/libwx/wx_type.h
@@
-7,11
+7,6
@@
#include <linux/bitfield.h>
#include <linux/netdevice.h>
-/* Vendor ID */
-#ifndef PCI_VENDOR_ID_WANGXUN
-#define PCI_VENDOR_ID_WANGXUN 0x8088
-#endif
-
#define WX_NCSI_SUP 0x8000
#define WX_NCSI_MASK 0x8000
#define WX_WOL_SUP 0x4000