diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-07 18:59:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-07 18:59:38 -0400 |
| commit | 597e608a8492d662736c9bc6aa507dbf1cadc17d (patch) | |
| tree | 6c330cdd0a4809f67dd191b37e34f5b4318cef78 /drivers/net/phy | |
| parent | acbc0f039ff4b93da737c91937b7c70018ded39f (diff) | |
| parent | 33b665eeeb85956ccbdf31c4c31a4e2a31133c44 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/phy')
| -rw-r--r-- | drivers/net/phy/lxt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/phy/lxt.c b/drivers/net/phy/lxt.c index dbd003453737..29c39ff85de5 100644 --- a/drivers/net/phy/lxt.c +++ b/drivers/net/phy/lxt.c | |||
| @@ -226,6 +226,7 @@ module_exit(lxt_exit); | |||
| 226 | static struct mdio_device_id lxt_tbl[] = { | 226 | static struct mdio_device_id lxt_tbl[] = { |
| 227 | { 0x78100000, 0xfffffff0 }, | 227 | { 0x78100000, 0xfffffff0 }, |
| 228 | { 0x001378e0, 0xfffffff0 }, | 228 | { 0x001378e0, 0xfffffff0 }, |
| 229 | { 0x00137a10, 0xfffffff0 }, | ||
| 229 | { } | 230 | { } |
| 230 | }; | 231 | }; |
| 231 | 232 | ||