Skip to contentSkip to conversation

s390 fixes (8/12).

PATCH New Martin Schwidefsky 1 participant 1 message Feb 3, 2003

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 s390 fixes (8/12).

updates for unified netdev config

- remove duplicate questions from drivers/s390/Kconfig
- some trivial fixes to make the s390 specific options work

arch/s390/Kconfig +3 -0
diff -urN linux-2.5.59/arch/s390/Kconfig linux-2.5.59-s390/arch/s390/Kconfig
@@ -268,6 +268,9 @@
 
 endmenu
 
+config PCMCIA
+	bool
+	default n
 
 menu "SCSI support"
 
arch/s390x/Kconfig +3 -0
diff -urN linux-2.5.59/arch/s390x/Kconfig linux-2.5.59-s390/arch/s390x/Kconfig
@@ -282,6 +282,9 @@
 
 endmenu
 
+config PCMCIA
+	bool
+	default n
 
 menu "SCSI support"
 

diff -urN linux-2.5.59/drivers/net/Kconfig
linux-2.5.59-s390/drivers/net/Kconfig

drivers/net/Kconfig +2 -0
@@ -2561,3 +2561,5 @@
 source "drivers/net/pcmcia/Kconfig"
 
 source "drivers/atm/Kconfig"
+
+source "drivers/s390/net/Kconfig"

diff -urN linux-2.5.59/drivers/net/tokenring/Kconfig linux-2.5.59-s390/drivers/net/tokenring/Kconfig

drivers/net/tokenring/Kconfig +1 -1
@@ -8,7 +8,7 @@
 # So far, we only have PCI, ISA, and MCA token ring devices
 config TR
 	bool "Token Ring driver support"
-	depends on (PCI || ISA || MCA) && LLC=y
+	depends on (PCI || ISA || MCA || CCW) && LLC=y
 	help
 	  Token Ring is IBM's way of communication on a local network; the
 	  rest of the world uses Ethernet. To participate on a Token Ring

diff -urN linux-2.5.59/drivers/s390/Kconfig
linux-2.5.59-s390/drivers/s390/Kconfig

drivers/s390/Kconfig +4 -215

232 lines not on this page · raw message

diff -urN linux-2.5.59/drivers/s390/net/Kconfig
linux-2.5.59-s390/drivers/s390/net/Kconfig

drivers/s390/net/Kconfig +38 -0
@@ -0,0 +1,38 @@
+menu "S/390 network device drivers"
+	depends on NETDEVICES && ARCH_S390
+
+config LCS
+	tristate "Lan Channel Station Interface"
+	depends on NETDEVICES && (NET_ETHERNET || TR || FDDI)
+	help
+	   Select this option if you want to use LCS networking  on IBM S/390
+  	   or zSeries. This device driver supports Token Ring (IEEE 802.5),
+  	   FDDI (IEEE 802.7) and Ethernet. 
+	   This option is also available as a module which will be
+	   called lcs.o . If you do not know what it is, it's safe to say "Y".
+
+config CTC
+	tristate "CTC device support"
+	depends on NETDEVICES
+	help
+	  Select this option if you want to use channel-to-channel networking
+	  on IBM S/390 or zSeries. This device driver supports real CTC
+	  coupling using ESCON. It also supports virtual CTCs when running
+	  under VM. It will use the channel device configuration if this is
+	  available.  This option is also available as a module which will be
+	  called ctc.o.  If you do not know what it is, it's safe to say "Y".
+
+config IUCV
+	tristate "IUCV device support (VM only)"
+	depends on NETDEVICES
+	help
+	  Select this option if you want to use inter-user communication
+	  vehicle networking under VM or VIF.  This option is also available
+	  as a module which will be called iucv.o. If unsure, say "Y".
+
+config CCWGROUP
+ 	tristate
+ 	depends on LCS || CTC
+	default m if LCS!=y && CTC!=y
+	default y if LCS=y || CTC=y
+endmenu