From: Francois Romieu <romieu@fr.zoreil.com>
Date: Mon, 12 Jul 2010 00:10:09 +0000 (-0700)
Subject: r8169: incorrect identifier for a 8168dp
X-Git-Tag: v2.6.35-rc6~15^2~16
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=17c99297212a2d1b1779a08caf4b0d83a85545df;p=pandora-kernel.git

r8169: incorrect identifier for a 8168dp

Merge error.

See CFG_METHOD_8 (0x3c800000 + 0x00300000) since version 8.002.00
of Realtek's driver.

Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Hayes <hayeswang@realtek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

Reading git-diff-tree failed