git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'work.misc' and 'work.dcache' of git://git.kernel.org/pub/scm/linux...
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
ethernet
/
3com
/
Kconfig
diff --git
a/drivers/net/ethernet/3com/Kconfig
b/drivers/net/ethernet/3com/Kconfig
index 5b7658bcf0209546a4577d708123231c55f97960..5c3ef9fc8207e3de01b86e4c538633ecc8a9f273 100644
(file)
--- a/
drivers/net/ethernet/3com/Kconfig
+++ b/
drivers/net/ethernet/3com/Kconfig
@@
-32,7
+32,7
@@
config EL3
config 3C515
tristate "3c515 ISA \"Fast EtherLink\""
- depends on ISA && ISA_DMA_API
+ depends on ISA && ISA_DMA_API
&& !PPC32
---help---
If you have a 3Com ISA EtherLink XL "Corkscrew" 3c515 Fast Ethernet
network card, say Y here.