diff options
author | Randy Dunlap <rdunlap@infradead.org> | 2018-07-21 15:59:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-07-22 14:12:29 -0400 |
commit | c9ce1fa1c24b08e13c2a3b5b1f94a19c9eaa982c (patch) | |
tree | d52bc01bbccc15dd383718268ed45d646ee9436a | |
parent | b809ec869b2cf2af053ffd99e5a46ab600e94aa2 (diff) |
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 <rdunlap@infradead.org>
Suggested-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/3com/Kconfig | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/amd/Kconfig | 4 | ||||
-rw-r--r-- | drivers/net/ethernet/cirrus/Kconfig | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/3com/Kconfig b/drivers/net/ethernet/3com/Kconfig index 5b7658bcf020..5c3ef9fc8207 100644 --- a/drivers/net/ethernet/3com/Kconfig +++ b/drivers/net/ethernet/3com/Kconfig | |||
@@ -32,7 +32,7 @@ config EL3 | |||
32 | 32 | ||
33 | config 3C515 | 33 | config 3C515 |
34 | tristate "3c515 ISA \"Fast EtherLink\"" | 34 | tristate "3c515 ISA \"Fast EtherLink\"" |
35 | depends on ISA && ISA_DMA_API | 35 | depends on ISA && ISA_DMA_API && !PPC32 |
36 | ---help--- | 36 | ---help--- |
37 | If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet | 37 | If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet |
38 | network card, say Y here. | 38 | network card, say Y here. |
diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig index f273af136fc7..9e5cf5583c87 100644 --- a/drivers/net/ethernet/amd/Kconfig +++ b/drivers/net/ethernet/amd/Kconfig | |||
@@ -44,7 +44,7 @@ config AMD8111_ETH | |||
44 | 44 | ||
45 | config LANCE | 45 | config LANCE |
46 | tristate "AMD LANCE and PCnet (AT1500 and NE2100) support" | 46 | 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 |
48 | ---help--- | 48 | ---help--- |
49 | If you have a network (Ethernet) card of this type, say Y here. | 49 | If you have a network (Ethernet) card of this type, say Y here. |
50 | Some LinkSys cards are of this type. | 50 | Some LinkSys cards are of this type. |
@@ -138,7 +138,7 @@ config PCMCIA_NMCLAN | |||
138 | 138 | ||
139 | config NI65 | 139 | config NI65 |
140 | tristate "NI6510 support" | 140 | tristate "NI6510 support" |
141 | depends on ISA && ISA_DMA_API && !ARM | 141 | depends on ISA && ISA_DMA_API && !ARM && !PPC32 |
142 | ---help--- | 142 | ---help--- |
143 | If you have a network (Ethernet) card of this type, say Y here. | 143 | If you have a network (Ethernet) card of this type, say Y here. |
144 | 144 | ||
diff --git a/drivers/net/ethernet/cirrus/Kconfig b/drivers/net/ethernet/cirrus/Kconfig index 5ab912937aff..ec0b545197e2 100644 --- a/drivers/net/ethernet/cirrus/Kconfig +++ b/drivers/net/ethernet/cirrus/Kconfig | |||
@@ -19,6 +19,7 @@ if NET_VENDOR_CIRRUS | |||
19 | config CS89x0 | 19 | config CS89x0 |
20 | tristate "CS89x0 support" | 20 | tristate "CS89x0 support" |
21 | depends on ISA || EISA || ARM | 21 | depends on ISA || EISA || ARM |
22 | depends on !PPC32 | ||
22 | ---help--- | 23 | ---help--- |
23 | Support for CS89x0 chipset based Ethernet cards. If you have a | 24 | Support for CS89x0 chipset based Ethernet cards. If you have a |
24 | network (Ethernet) card of this type, say Y and read the file | 25 | network (Ethernet) card of this type, say Y and read the file |