[PATCH] Make pasemi_mac.c depend on PPC_PASEMI to prevent link errors
From: Michael Ellerman <hidden>
Date: 2008-03-28 01:17:33
Subsystems: networking drivers, the rest · Maintainers: Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
3 messages, 3 authors, 2008-03-29 · open the first message on its own page
From: Michael Ellerman <hidden>
Date: 2008-03-28 01:17:33
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 <redacted> --- drivers/net/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Jeff, pending Olof's ack, this would be nice for 25, but is obviously not super important.
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index fe7b5ec..3a0b20a 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
--
1.5.2.rc1.1884.g59b20
From: Olof Johansson <hidden>
Date: 2008-03-28 01:45:31
On Fri, Mar 28, 2008 at 12:17:33PM +1100, Michael Ellerman wrote:
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.
Ah, good catch. It was OK until I introduced dma_lib under platforms/pasemi.
Signed-off-by: Michael Ellerman <redacted>
Acked-by: Olof Johansson <redacted> -Olof
From: Jeff Garzik <hidden>
Date: 2008-03-29 01:54:03
Michael Ellerman wrote:
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 <redacted> --- drivers/net/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) Jeff, pending Olof's ack, this would be nice for 25, but is obviously not super important.diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index fe7b5ec..3a0b20a 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
applied