Changeset 18382

Timestamp:

02/06/12 14:45:01 (16 months ago)

Author:

BrainSlayer

Message:

resolv conflicts

Location:

src/linux/universal/linux-3.2/drivers/net/ethernet/raeth

Files:

• Kconfig (modified) (2 diffs)
• raether.c (modified) (1 diff)

src/linux/universal/linux-3.2/drivers/net/ethernet/raeth/Kconfig

@@ -45 +45 @@
         depends on !RALINK_RT3052
 
-config  ICPLUS_PHY
+config  RAETH_ICPLUS_PHY
         bool "100PHY"
         depends on !RALINK_RT3052
@@ -233 +233 @@
         depends on !RALINK_RT3052
 
-config  ICPLUS_PHY
+config  RAETH_ICPLUS_PHY
         bool "100PHY"
         depends on !RALINK_RT3052

src/linux/universal/linux-3.2/drivers/net/ethernet/raeth/raether.c

@@ -2543 +2543 @@
 //        sysRegWrite(MDIO_CFG, 0x0000dc01);
 
-#elif defined (CONFIG_RAETH_ROUTER) || defined (CONFIG_ICPLUS_PHY)
+#elif defined (CONFIG_RAETH_ROUTER) || defined (CONFIG_RAETH_ICPLUS_PHY)
 
         sysRegWrite(MDIO_CFG, INIT_VALUE_OF_ICPLUS_PHY_INIT_VALUE);