tree 66ba7a844dacbf061a2aa62396f49640a81213cb
parent da0420bee24a1ba54e55a61e95b1a53205d7e62d
author Francois Romieu <romieu@fr.zoreil.com> 1303937542 -0700
committer David S. Miller <davem@davemloft.net> 1303937542 -0700

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>