diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/phy/Kconfig | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/phy/Kconfig')
| -rw-r--r-- | drivers/net/phy/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index eb799b36c86a..a70244306c94 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig | |||
| @@ -65,7 +65,7 @@ config BCM63XX_PHY | |||
| 65 | config ICPLUS_PHY | 65 | config ICPLUS_PHY |
| 66 | tristate "Drivers for ICPlus PHYs" | 66 | tristate "Drivers for ICPlus PHYs" |
| 67 | ---help--- | 67 | ---help--- |
| 68 | Currently supports the IP175C PHY. | 68 | Currently supports the IP175C and IP1001 PHYs. |
| 69 | 69 | ||
| 70 | config REALTEK_PHY | 70 | config REALTEK_PHY |
| 71 | tristate "Drivers for Realtek PHYs" | 71 | tristate "Drivers for Realtek PHYs" |
| @@ -78,7 +78,6 @@ config NATIONAL_PHY | |||
| 78 | Currently supports the DP83865 PHY. | 78 | Currently supports the DP83865 PHY. |
| 79 | 79 | ||
| 80 | config STE10XP | 80 | config STE10XP |
| 81 | depends on PHYLIB | ||
| 82 | tristate "Driver for STMicroelectronics STe10Xp PHYs" | 81 | tristate "Driver for STMicroelectronics STe10Xp PHYs" |
| 83 | ---help--- | 82 | ---help--- |
| 84 | This is the driver for the STe100p and STe101p PHYs. | 83 | This is the driver for the STe100p and STe101p PHYs. |