Skip to content

Commit c9ce1fa

Browse files
rddunlapdavem330
authored andcommitted
net: prevent ISA drivers from building on PPC32
Prevent drivers from building on PPC32 if they use isa_bus_to_virt(), isa_virt_to_bus(), or isa_page_to_bus(), which are not available and thus cause build errors. ../drivers/net/ethernet/3com/3c515.c: In function 'corkscrew_open': ../drivers/net/ethernet/3com/3c515.c:824:9: error: implicit declaration of function 'isa_virt_to_bus'; did you mean 'virt_to_bus'? [-Werror=implicit-function-declaration] ../drivers/net/ethernet/amd/lance.c: In function 'lance_rx': ../drivers/net/ethernet/amd/lance.c:1203:23: error: implicit declaration of function 'isa_bus_to_virt'; did you mean 'bus_to_virt'? [-Werror=implicit-function-declaration] ../drivers/net/ethernet/amd/ni65.c: In function 'ni65_init_lance': ../drivers/net/ethernet/amd/ni65.c:585:20: error: implicit declaration of function 'isa_virt_to_bus'; did you mean 'virt_to_bus'? [-Werror=implicit-function-declaration] ../drivers/net/ethernet/cirrus/cs89x0.c: In function 'net_open': ../drivers/net/ethernet/cirrus/cs89x0.c:897:20: error: implicit declaration of function 'isa_virt_to_bus'; did you mean 'virt_to_bus'? [-Werror=implicit-function-declaration] Signed-off-by: Randy Dunlap <[email protected]> Suggested-by: Michael Ellerman <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent b809ec8 commit c9ce1fa

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

drivers/net/ethernet/3com/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ config EL3
3232

3333
config 3C515
3434
tristate "3c515 ISA \"Fast EtherLink\""
35-
depends on ISA && ISA_DMA_API
35+
depends on ISA && ISA_DMA_API && !PPC32
3636
---help---
3737
If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
3838
network card, say Y here.

drivers/net/ethernet/amd/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ config AMD8111_ETH
4444

4545
config LANCE
4646
tristate "AMD LANCE and PCnet (AT1500 and NE2100) support"
47-
depends on ISA && ISA_DMA_API && !ARM
47+
depends on ISA && ISA_DMA_API && !ARM && !PPC32
4848
---help---
4949
If you have a network (Ethernet) card of this type, say Y here.
5050
Some LinkSys cards are of this type.
@@ -138,7 +138,7 @@ config PCMCIA_NMCLAN
138138

139139
config NI65
140140
tristate "NI6510 support"
141-
depends on ISA && ISA_DMA_API && !ARM
141+
depends on ISA && ISA_DMA_API && !ARM && !PPC32
142142
---help---
143143
If you have a network (Ethernet) card of this type, say Y here.
144144

drivers/net/ethernet/cirrus/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ if NET_VENDOR_CIRRUS
1919
config CS89x0
2020
tristate "CS89x0 support"
2121
depends on ISA || EISA || ARM
22+
depends on !PPC32
2223
---help---
2324
Support for CS89x0 chipset based Ethernet cards. If you have a
2425
network (Ethernet) card of this type, say Y and read the file

0 commit comments

Comments
 (0)