Merge branch 'davem-next.r8169' of git://git.kernel.org/pub/scm/linux/kernel/git...

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/r8169.c
index 7ffdb80,52e20d5..5e40351
--- 1/drivers/net/r8169.c
--- 2/drivers/net/r8169.c
+++ b/drivers/net/r8169.c
@@@ -3945,9 -4007,16 +4022,16 @@@ static void rtl_hw_start_8101(struct ne
        case RTL_GIGA_MAC_VER_09:
                rtl_hw_start_8102e_2(ioaddr, pdev);
                break;
+ 
+       case RTL_GIGA_MAC_VER_29:
+               rtl_hw_start_8105e_1(ioaddr, pdev);
+               break;
+       case RTL_GIGA_MAC_VER_30:
+               rtl_hw_start_8105e_2(ioaddr, pdev);
+               break;
        }
  
 -      RTL_W8(Cfg9346, Cfg9346_Unlock);
 +      RTL_W8(Cfg9346, Cfg9346_Lock);
  
        RTL_W8(MaxTxPacketSize, TxPacketMax);