[PATCH] Make pasemi_mac.c depend on PPC_PASEMI to prevent link errors

2008-03-27 Thread Michael Ellerman
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 <[EMAIL PROTECTED]>
---
 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

___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev


Re: [PATCH] Make pasemi_mac.c depend on PPC_PASEMI to prevent link errors

2008-03-27 Thread Olof Johansson
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 <[EMAIL PROTECTED]>

Acked-by: Olof Johansson <[EMAIL PROTECTED]>


-Olof
___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev


Re: [PATCH] Make pasemi_mac.c depend on PPC_PASEMI to prevent link errors

2008-03-28 Thread Jeff Garzik

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 <[EMAIL PROTECTED]>
---
 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


___
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev