* [PATCH] Make pasemi_mac.c depend on PPC_PASEMI to prevent link errors
@ 2008-03-28 1:17 Michael Ellerman
2008-03-28 1:54 ` Olof Johansson
2008-03-29 1:53 ` Jeff Garzik
0 siblings, 2 replies; 3+ messages in thread
From: Michael Ellerman @ 2008-03-28 1:17 UTC (permalink / raw)
To: Jeff Garzik; +Cc: Olof Johannsson, linuxppc-dev
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 <michael@ellerman.id.au>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Make pasemi_mac.c depend on PPC_PASEMI to prevent link errors
2008-03-28 1:17 [PATCH] Make pasemi_mac.c depend on PPC_PASEMI to prevent link errors Michael Ellerman
@ 2008-03-28 1:54 ` Olof Johansson
2008-03-29 1:53 ` Jeff Garzik
1 sibling, 0 replies; 3+ messages in thread
From: Olof Johansson @ 2008-03-28 1:54 UTC (permalink / raw)
To: Michael Ellerman; +Cc: linuxppc-dev, Jeff Garzik
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 <michael@ellerman.id.au>
Acked-by: Olof Johansson <olof@lixom.net>
-Olof
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Make pasemi_mac.c depend on PPC_PASEMI to prevent link errors
2008-03-28 1:17 [PATCH] Make pasemi_mac.c depend on PPC_PASEMI to prevent link errors Michael Ellerman
2008-03-28 1:54 ` Olof Johansson
@ 2008-03-29 1:53 ` Jeff Garzik
1 sibling, 0 replies; 3+ messages in thread
From: Jeff Garzik @ 2008-03-29 1:53 UTC (permalink / raw)
To: Michael Ellerman; +Cc: Olof Johannsson, linuxppc-dev
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 <michael@ellerman.id.au>
> ---
> 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-03-29 1:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-03-28 1:17 [PATCH] Make pasemi_mac.c depend on PPC_PASEMI to prevent link errors Michael Ellerman
2008-03-28 1:54 ` Olof Johansson
2008-03-29 1:53 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).