diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2012-11-16 15:43:59 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-17 22:11:45 -0500 |
| commit | 18d359ceb04485df0e387e04b0e52a761c4c58a0 (patch) | |
| tree | e65db5958098d3544634a992bfcbb6b45b70da9b | |
| parent | e8e55d9514f2eb2ffbb79b07636fb7b3c944b1a1 (diff) | |
| download | linux-stable-18d359ceb04485df0e387e04b0e52a761c4c58a0.tar.gz linux-stable-18d359ceb04485df0e387e04b0e52a761c4c58a0.tar.bz2 linux-stable-18d359ceb04485df0e387e04b0e52a761c4c58a0.zip | |
pch_gbe, ptp_pch: Fix the dependency direction between these drivers
In commit a24006ed12616bde1bbdb26868495906a212d8dc ('ptp: Enable clock
drivers along with associated net/PHY drivers') I wrongly made
PTP_1588_CLOCK_PCH depend on PCH_GBE. The dependency is really the
other way around. Therefore make PCH_GBE select PTP_1588_CLOCK_PCH
and remove the 'default y' from the latter.
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/ethernet/oki-semi/pch_gbe/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/ptp/Kconfig | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig index 00bc4fc968c7..34d05bf72b2e 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig +++ b/drivers/net/ethernet/oki-semi/pch_gbe/Kconfig @@ -7,6 +7,7 @@ config PCH_GBE depends on PCI select NET_CORE select MII + select PTP_1588_CLOCK_PCH ---help--- This is a gigabit ethernet driver for EG20T PCH. EG20T PCH is the platform controller hub that is used in Intel's diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig index 70c5836ebfc9..1ea6f1dbbedd 100644 --- a/drivers/ptp/Kconfig +++ b/drivers/ptp/Kconfig @@ -72,9 +72,7 @@ config DP83640_PHY config PTP_1588_CLOCK_PCH tristate "Intel PCH EG20T as PTP clock" - depends on PCH_GBE select PTP_1588_CLOCK - default y help This driver adds support for using the PCH EG20T as a PTP clock. The hardware supports time stamping of PTP packets |