From: Francois Romieu <romieu@fr.zoreil.com>
Date: Wed, 27 Apr 2011 20:52:22 +0000 (-0700)
Subject: r8169: fix merge conflict fix.
X-Git-Tag: v3.0-rc1~377^2~230
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=15ecd039b7182d725f4294e01f2fb12c3a88db17;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed