projects / platform / kernel / linux-amlogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: da0420b) | patch
r8169: fix merge conflict fix.
authorFrancois Romieu <romieu@fr.zoreil.com>
Wed, 27 Apr 2011 20:52:22 +0000 (13:52 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 27 Apr 2011 20:52:22 +0000 (13:52 -0700)
commit15ecd039b7182d725f4294e01f2fb12c3a88db17
tree66ba7a844dacbf061a2aa62396f49640a81213cbtree | snapshot
parentda0420bee24a1ba54e55a61e95b1a53205d7e62dcommit | diff
r8169: fix merge conflict fix.

- use adequate MAC_VER id
  (see 01dc7fec4025f6bb72b6b98ec88b375346b6dbbb)
- remove duplicate rtl_firmware_info record
- remove duplicate functions

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Realtek linux nic maintainers <nic_swsd@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/r8169.c diff | blob | history
Domain: System / Kernel;