From: Michael Ellerman Date: Fri, 28 Mar 2008 01:17:33 +0000 (+1100) Subject: Make pasemi_mac.c depend on PPC_PASEMI to prevent link errors X-Git-Tag: v2.6.25-rc9~99^2~19^2~4 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5beaf7d6f89c13b2414656e994d3ee6350e99d3a;p=linux-2.6-omap-h63xx.git Make pasemi_mac.c depend on PPC_PASEMI to prevent link errors drivers/net/pasemi_mac.c is enabled by CONFIG_PASEMI_MAC, which depends on PPC64 && PCI. However pasemi_mac.c uses several routines that are only built when PPC_PASEMI is selected. This can lead to an unbuildable config: ERROR: ".pasemi_dma_start_chan" [drivers/net/pasemi_mac.ko] undefined! So make CONFIG_PASEMI_MAC depend on PPC_PASEMI instead of PPC64. Signed-off-by: Michael Ellerman Signed-off-by: Jeff Garzik --- diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index fe7b5ec0970..3a0b20afec7 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -2635,7 +2635,7 @@ config NIU config PASEMI_MAC tristate "PA Semi 1/10Gbit MAC" - depends on PPC64 && PCI + depends on PPC_PASEMI && PCI select PHYLIB select INET_LRO help