]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b3b6fed) | 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)
commit2b5da02807c392a49dc565b95a0cccc800b4009e
tree66ba7a844dacbf061a2aa62396f49640a81213cbtree | snapshot
parentb3b6fed16d4ba529f7ef7645e329dc738826d7a6commit | diff
r8169: fix merge conflict fix.

- use adequate MAC_VER id
  (see ea6f0b189962aec4be866b273a67fe75873e558c)
- 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
Linux Kernel Source Tree.