mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 15:18:19 +00:00
Code Issues Releases Wiki Activity

pch_gbe, ptp_pch: Fix the dependency direction between these drivers

Browse source 
In commit a24006ed12 ('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>
This commit is contained in:
Ben Hutchings 2012-11-16 15:43:59 +00:00 committed by David S. Miller
parent e8e55d9514
commit 18d359ceb0
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/ethernet/oki-semi/pch_gbe/Kconfig
View file

@ -7,6 +7,7 @@ config PCH_GBE
depends on PCI depends on PCI
select NET_CORE select NET_CORE
select MII select MII
select PTP_1588_CLOCK_PCH
---help--- ---help---
This is a gigabit ethernet driver for EG20T PCH. This is a gigabit ethernet driver for EG20T PCH.
EG20T PCH is the platform controller hub that is used in Intel's EG20T PCH is the platform controller hub that is used in Intel's

2
drivers/ptp/Kconfig
View file

@ -72,9 +72,7 @@ config DP83640_PHY
config PTP_1588_CLOCK_PCH config PTP_1588_CLOCK_PCH
tristate "Intel PCH EG20T as PTP clock" tristate "Intel PCH EG20T as PTP clock"
depends on PCH_GBE
select PTP_1588_CLOCK select PTP_1588_CLOCK
default y
help help
This driver adds support for using the PCH EG20T as a PTP This driver adds support for using the PCH EG20T as a PTP
clock. The hardware supports time stamping of PTP packets clock. The hardware supports time stamping of PTP packets