Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 61d48c2c authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

[S390] Kconfig: use common Kconfig files for s390. 



Disband drivers/s390/Kconfig, use the common Kconfig files. The s390
specific config options from drivers/s390/Kconfig are moved to the
respective common Kconfig files.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent abf3ea1b

arch/s390/Kconfig

+16 −33
Original line number Diff line number Diff line
@@ -4,27 +4,23 @@ 
#



config MMU

	bool

	default y

	def_bool y



config ZONE_DMA

	def_bool y

	depends on 64BIT



config LOCKDEP_SUPPORT

	bool

	default y

	def_bool y



config STACKTRACE_SUPPORT

	bool

	default y

	def_bool y



config RWSEM_GENERIC_SPINLOCK

	bool



config RWSEM_XCHGADD_ALGORITHM

	bool

	default y

	def_bool y



config ARCH_HAS_ILOG2_U32

	bool
@@ -35,8 +31,7 @@ config ARCH_HAS_ILOG2_U64 
	default n



config GENERIC_HWEIGHT

	bool

	default y

	def_bool y



config GENERIC_TIME

	def_bool y
@@ -55,8 +50,7 @@ config NO_DMA 
mainmenu "Linux Kernel Configuration"



config S390

	bool

	default y

	def_bool y



source "init/Kconfig"
@@ -280,6 +274,10 @@ config WARN_STACK_SIZE 
config ARCH_POPULATES_NODE_MAP

	def_bool y



comment "Kernel preemption"



source "kernel/Kconfig.preempt"



source "mm/Kconfig"



config HOLES_IN_ZONE
@@ -320,17 +318,6 @@ config QDIO_DEBUG 


comment "Misc"



config PREEMPT

	bool "Preemptible Kernel"

	help

	  This option reduces the latency of the kernel when reacting to

	  real-time or interactive events by allowing a low priority process to

	  be preempted even if it is in kernel mode executing a system call.

	  This allows applications to run more reliably even when the system is

	  under load.



	  Say N if you are unsure.



config IPL

	bool "Builtin IPL record support"

	help
@@ -488,6 +475,8 @@ config APPLDATA_NET_SUM 
	  This can also be compiled as a module, which will be called

	  appldata_net_sum.o.



source kernel/Kconfig.hz



config NO_IDLE_HZ

	bool "No HZ timer ticks in idle"

	help
@@ -535,18 +524,12 @@ endmenu 
source "net/Kconfig"



config PCMCIA

	bool

	default n



source "drivers/base/Kconfig"

	def_bool n



source "drivers/connector/Kconfig"



source "drivers/scsi/Kconfig"



source "drivers/s390/Kconfig"

config CCW

	def_bool y



source "drivers/net/Kconfig"

source "drivers/Kconfig"



source "fs/Kconfig"

drivers/block/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -444,8 +444,6 @@ config CDROM_PKTCDVD_WCACHE 
	  this option is dangerous unless the CD-RW media is known good, as we

	  don't do deferred write error handling yet.



source "drivers/s390/block/Kconfig"



config ATA_OVER_ETH

	tristate "ATA over Ethernet support"

	depends on NET
@@ -453,6 +451,8 @@ config ATA_OVER_ETH 
	This driver provides Support for ATA over Ethernet block

	devices like the Coraid EtherDrive (R) Storage Blade.



source "drivers/s390/block/Kconfig"



endmenu



endif

drivers/char/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -1081,5 +1081,7 @@ config DEVPORT 
	depends on ISA || PCI

	default y



source "drivers/s390/char/Kconfig"



endmenu

drivers/crypto/Kconfig

+22 −0
Original line number Diff line number Diff line
@@ -56,4 +56,26 @@ config CRYPTO_DEV_GEODE 
	  To compile this driver as a module, choose M here: the module

	  will be called geode-aes.



config ZCRYPT

	tristate "Support for PCI-attached cryptographic adapters"

	depends on S390

	select ZCRYPT_MONOLITHIC if ZCRYPT="y"

	default "m"

	help

	  Select this option if you want to use a PCI-attached cryptographic

	  adapter like:

	  + PCI Cryptographic Accelerator (PCICA)

	  + PCI Cryptographic Coprocessor (PCICC)

	  + PCI-X Cryptographic Coprocessor (PCIXCC)

	  + Crypto Express2 Coprocessor (CEX2C)

	  + Crypto Express2 Accelerator (CEX2A)



config ZCRYPT_MONOLITHIC

	bool "Monolithic zcrypt module"

	depends on ZCRYPT="m"

	help

	  Select this option if you want to have a single module z90crypt.ko

	  that contains all parts of the crypto device driver (ap bus,

	  request router and all the card drivers).



endmenu

drivers/s390/block/Kconfig

+4 −7
Original line number Diff line number Diff line 
if S390 && BLOCK



comment "S/390 block device drivers"

	depends on S390

	depends on S390 && BLOCK



config BLK_DEV_XPRAM

	tristate "XPRAM disk support"

	depends on S390

	depends on S390 && BLOCK

	help

	  Select this option if you want to use your expanded storage on S/390

	  or zSeries as a disk.  This is useful as a _fast_ swap device if you
@@ -15,12 +13,13 @@ config BLK_DEV_XPRAM 


config DCSSBLK

	tristate "DCSSBLK support"

	depends on S390 && BLOCK

	help

	  Support for dcss block device



config DASD

	tristate "Support for DASD devices"

	depends on CCW

	depends on CCW && BLOCK

	help

	  Enable this option if you want to access DASDs directly utilizing

	  S/390s channel subsystem commands. This is necessary for running
@@ -62,5 +61,3 @@ config DASD_EER 
	  This driver provides a character device interface to the

	  DASD extended error reporting. This is only needed if you want to

	  use applications written for the EER facility.
 


endif