diff options
| author | Jens Axboe <axboe@fb.com> | 2014-09-22 13:57:32 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2014-09-22 13:57:32 -0400 |
| commit | 6d11fb454b161a4565c57be6f1c5527235741003 (patch) | |
| tree | c238ed3df2f654181c2a0746478a33b32214cc60 /drivers/phy/Kconfig | |
| parent | b207892b061da7608878e273ae22ba9bf9be264b (diff) | |
| parent | 8b95741569eabc5eb17da71d1d3668cdb0bef86c (diff) | |
Merge branch 'for-linus' into for-3.18/core
Moving patches from for-linus to 3.18 instead, pull in this changes
that will go to Linus today.
Diffstat (limited to 'drivers/phy/Kconfig')
| -rw-r--r-- | drivers/phy/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig index 0dd742719154..4ff8cbb620d3 100644 --- a/drivers/phy/Kconfig +++ b/drivers/phy/Kconfig | |||
| @@ -41,9 +41,9 @@ config PHY_MVEBU_SATA | |||
| 41 | config PHY_MIPHY365X | 41 | config PHY_MIPHY365X |
| 42 | tristate "STMicroelectronics MIPHY365X PHY driver for STiH41x series" | 42 | tristate "STMicroelectronics MIPHY365X PHY driver for STiH41x series" |
| 43 | depends on ARCH_STI | 43 | depends on ARCH_STI |
| 44 | depends on GENERIC_PHY | ||
| 45 | depends on HAS_IOMEM | 44 | depends on HAS_IOMEM |
| 46 | depends on OF | 45 | depends on OF |
| 46 | select GENERIC_PHY | ||
| 47 | help | 47 | help |
| 48 | Enable this to support the miphy transceiver (for SATA/PCIE) | 48 | Enable this to support the miphy transceiver (for SATA/PCIE) |
| 49 | that is part of STMicroelectronics STiH41x SoC series. | 49 | that is part of STMicroelectronics STiH41x SoC series. |