Skip to content

L
linux
Commit 0e10b50f authored by Jeff Garzik's avatar Jeff Garzik
Browse files
Options

Merge pobox.com:/garz/repo/linux-2.6 

into pobox.com:/garz/repo/netdev-2.6/misc
parents 1b6aa634 8f2714ca
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 21 deletions
drivers/net/Kconfig
View file @ 0e10b50f
...@@ -1181,6 +1181,7 @@ config IBMVETH ...@@ -1181,6 +1181,7 @@ config IBMVETH
config IBM_EMAC config IBM_EMAC
tristate "IBM PPC4xx EMAC driver support" tristate "IBM PPC4xx EMAC driver support"
depends on 4xx depends on 4xx
select CRC32
---help--- ---help---
This driver supports the IBM PPC4xx EMAC family of on-chip This driver supports the IBM PPC4xx EMAC family of on-chip
Ethernet controllers. Ethernet controllers.
......
drivers/net/sis900.c
View file @ 0e10b50f
...@@ -120,6 +120,7 @@ static struct mii_chip_info { ...@@ -120,6 +120,7 @@ static struct mii_chip_info {
} mii_chip_table[] = { } mii_chip_table[] = {
{ "SiS 900 Internal MII PHY", 0x001d, 0x8000, LAN }, { "SiS 900 Internal MII PHY", 0x001d, 0x8000, LAN },
{ "SiS 7014 Physical Layer Solution", 0x0016, 0xf830, LAN }, { "SiS 7014 Physical Layer Solution", 0x0016, 0xf830, LAN },
{ "Altimata AC101LF PHY", 0x0022, 0x5520, LAN },
{ "AMD 79C901 10BASE-T PHY", 0x0000, 0x6B70, LAN }, { "AMD 79C901 10BASE-T PHY", 0x0000, 0x6B70, LAN },
{ "AMD 79C901 HomePNA PHY", 0x0000, 0x6B90, HOME}, { "AMD 79C901 HomePNA PHY", 0x0000, 0x6B90, HOME},
{ "ICS LAN PHY", 0x0015, 0xF440, LAN }, { "ICS LAN PHY", 0x0015, 0xF440, LAN },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7