projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ddcde70)
net: bnx2x: avoid macro redefinition
authorDavid Decotigny <decot@googlers.com>
Sun, 11 Jan 2015 19:42:37 +0000 (11:42 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 12 Jan 2015 21:51:15 +0000 (16:51 -0500)
Signed-off-by: David Decotigny <decot@googlers.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/broadcom/bnx2x/bnx2x.h patch | blob | blame | history

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 792ba72fb5c815cded9d20cc01024e7c7678f380..756053c028becff93c62cfcdbd6e1f635594cc01 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -1138,12 +1138,8 @@ struct bnx2x_port {
        u32                     link_config[LINK_CONFIG_SIZE];
 
        u32                     supported[LINK_CONFIG_SIZE];
-/* link settings - missing defines */
-#define SUPPORTED_2500baseX_Full       (1 << 15)
 
        u32                     advertising[LINK_CONFIG_SIZE];
-/* link settings - missing defines */
-#define ADVERTISED_2500baseX_Full      (1 << 15)
 
        u32                     phy_addr;