diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-10 14:50:51 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-10 14:50:51 -0400 |
commit | fc0b60f1dc311a2f7443ce46305edd287b2d8947 (patch) | |
tree | ffe830c647bd7659c613c2429453e7da787910df /drivers | |
parent | e9910846fdb19f7c5810cbe4c95e4ca6dab6a00f (diff) | |
parent | 906fc9e92f0e8b618d4025c3aa6289415ecd8152 (diff) |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] update default configuration.
[S390] Kconfig: no wireless on s390.
[S390] Kconfig: use common Kconfig files for s390.
[S390] Kconfig: common config options for s390.
[S390] Kconfig: unwanted menus for s390.
[S390] Kconfig: menus with depends on HAS_IOMEM.
[S390] Kconfig: refine depends statements.
[S390] Avoid compile warning.
[S390] qdio: re-add lost perf_stats.tl_runs change in qdio_handle_pci
[S390] Avoid sparse warnings.
[S390] dasd: Fix modular build.
[S390] monreader inlining cleanup.
[S390] cio: Make some structures and a function static.
[S390] cio: Get rid of _ccw_device_get_device_number().
[S390] fix subsystem removal fallout
Diffstat (limited to 'drivers')
55 files changed, 150 insertions, 152 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index c7219663f2b9..f031b8732330 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
@@ -3,6 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menu "Serial ATA (prod) and Parallel ATA (experimental) drivers" | 5 | menu "Serial ATA (prod) and Parallel ATA (experimental) drivers" |
6 | depends on HAS_IOMEM | ||
6 | 7 | ||
7 | config ATA | 8 | config ATA |
8 | tristate "ATA device support" | 9 | tristate "ATA device support" |
diff --git a/drivers/auxdisplay/Kconfig b/drivers/auxdisplay/Kconfig index 0300e7f54cc4..2e18a63ead36 100644 --- a/drivers/auxdisplay/Kconfig +++ b/drivers/auxdisplay/Kconfig | |||
@@ -6,6 +6,7 @@ | |||
6 | # | 6 | # |
7 | 7 | ||
8 | menu "Auxiliary Display support" | 8 | menu "Auxiliary Display support" |
9 | depends on PARPORT | ||
9 | 10 | ||
10 | config KS0108 | 11 | config KS0108 |
11 | tristate "KS0108 LCD Controller" | 12 | tristate "KS0108 LCD Controller" |
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig index 17ee97f3a99b..b4c8319138b2 100644 --- a/drivers/block/Kconfig +++ b/drivers/block/Kconfig | |||
@@ -444,8 +444,6 @@ config CDROM_PKTCDVD_WCACHE | |||
444 | this option is dangerous unless the CD-RW media is known good, as we | 444 | this option is dangerous unless the CD-RW media is known good, as we |
445 | don't do deferred write error handling yet. | 445 | don't do deferred write error handling yet. |
446 | 446 | ||
447 | source "drivers/s390/block/Kconfig" | ||
448 | |||
449 | config ATA_OVER_ETH | 447 | config ATA_OVER_ETH |
450 | tristate "ATA over Ethernet support" | 448 | tristate "ATA over Ethernet support" |
451 | depends on NET | 449 | depends on NET |
@@ -453,6 +451,8 @@ config ATA_OVER_ETH | |||
453 | This driver provides Support for ATA over Ethernet block | 451 | This driver provides Support for ATA over Ethernet block |
454 | devices like the Coraid EtherDrive (R) Storage Blade. | 452 | devices like the Coraid EtherDrive (R) Storage Blade. |
455 | 453 | ||
454 | source "drivers/s390/block/Kconfig" | ||
455 | |||
456 | endmenu | 456 | endmenu |
457 | 457 | ||
458 | endif | 458 | endif |
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 2df42fdcdc91..abcafac64738 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
@@ -6,6 +6,7 @@ menu "Character devices" | |||
6 | 6 | ||
7 | config VT | 7 | config VT |
8 | bool "Virtual terminal" if EMBEDDED | 8 | bool "Virtual terminal" if EMBEDDED |
9 | depends on !S390 | ||
9 | select INPUT | 10 | select INPUT |
10 | default y if !VIOCONS | 11 | default y if !VIOCONS |
11 | ---help--- | 12 | ---help--- |
@@ -81,6 +82,7 @@ config VT_HW_CONSOLE_BINDING | |||
81 | 82 | ||
82 | config SERIAL_NONSTANDARD | 83 | config SERIAL_NONSTANDARD |
83 | bool "Non-standard serial port support" | 84 | bool "Non-standard serial port support" |
85 | depends on HAS_IOMEM | ||
84 | ---help--- | 86 | ---help--- |
85 | Say Y here if you have any non-standard serial boards -- boards | 87 | Say Y here if you have any non-standard serial boards -- boards |
86 | which aren't supported using the standard "dumb" serial driver. | 88 | which aren't supported using the standard "dumb" serial driver. |
@@ -765,7 +767,7 @@ config NVRAM | |||
765 | 767 | ||
766 | config RTC | 768 | config RTC |
767 | tristate "Enhanced Real Time Clock Support" | 769 | tristate "Enhanced Real Time Clock Support" |
768 | depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM && !SUPERH | 770 | depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM && !SUPERH && !S390 |
769 | ---help--- | 771 | ---help--- |
770 | If you say Y here and create a character special file /dev/rtc with | 772 | If you say Y here and create a character special file /dev/rtc with |
771 | major number 10 and minor number 135 using mknod ("man mknod"), you | 773 | major number 10 and minor number 135 using mknod ("man mknod"), you |
@@ -813,7 +815,7 @@ config SGI_IP27_RTC | |||
813 | 815 | ||
814 | config GEN_RTC | 816 | config GEN_RTC |
815 | tristate "Generic /dev/rtc emulation" | 817 | tristate "Generic /dev/rtc emulation" |
816 | depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV | 818 | depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV && !S390 |
817 | ---help--- | 819 | ---help--- |
818 | If you say Y here and create a character special file /dev/rtc with | 820 | If you say Y here and create a character special file /dev/rtc with |
819 | major number 10 and minor number 135 using mknod ("man mknod"), you | 821 | major number 10 and minor number 135 using mknod ("man mknod"), you |
@@ -858,6 +860,7 @@ config COBALT_LCD | |||
858 | 860 | ||
859 | config DTLK | 861 | config DTLK |
860 | tristate "Double Talk PC internal speech card support" | 862 | tristate "Double Talk PC internal speech card support" |
863 | depends on ISA | ||
861 | help | 864 | help |
862 | This driver is for the DoubleTalk PC, a speech synthesizer | 865 | This driver is for the DoubleTalk PC, a speech synthesizer |
863 | manufactured by RC Systems (<http://www.rcsys.com/>). It is also | 866 | manufactured by RC Systems (<http://www.rcsys.com/>). It is also |
@@ -1043,7 +1046,7 @@ config HPET_MMAP | |||
1043 | 1046 | ||
1044 | config HANGCHECK_TIMER | 1047 | config HANGCHECK_TIMER |
1045 | tristate "Hangcheck timer" | 1048 | tristate "Hangcheck timer" |
1046 | depends on X86 || IA64 || PPC64 | 1049 | depends on X86 || IA64 || PPC64 || S390 |
1047 | help | 1050 | help |
1048 | The hangcheck-timer module detects when the system has gone | 1051 | The hangcheck-timer module detects when the system has gone |
1049 | out to lunch past a certain margin. It can reboot the system | 1052 | out to lunch past a certain margin. It can reboot the system |
@@ -1078,5 +1081,7 @@ config DEVPORT | |||
1078 | depends on ISA || PCI | 1081 | depends on ISA || PCI |
1079 | default y | 1082 | default y |
1080 | 1083 | ||
1084 | source "drivers/s390/char/Kconfig" | ||
1085 | |||
1081 | endmenu | 1086 | endmenu |
1082 | 1087 | ||
diff --git a/drivers/char/ipmi/Kconfig b/drivers/char/ipmi/Kconfig index a6dcb2918157..b894f67fdf14 100644 --- a/drivers/char/ipmi/Kconfig +++ b/drivers/char/ipmi/Kconfig | |||
@@ -3,6 +3,8 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menu "IPMI" | 5 | menu "IPMI" |
6 | depends on HAS_IOMEM | ||
7 | |||
6 | config IPMI_HANDLER | 8 | config IPMI_HANDLER |
7 | tristate 'IPMI top-level message handler' | 9 | tristate 'IPMI top-level message handler' |
8 | help | 10 | help |
diff --git a/drivers/char/tpm/Kconfig b/drivers/char/tpm/Kconfig index 11089be0691b..dc4e1ff7f56f 100644 --- a/drivers/char/tpm/Kconfig +++ b/drivers/char/tpm/Kconfig | |||
@@ -3,6 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menu "TPM devices" | 5 | menu "TPM devices" |
6 | depends on HAS_IOMEM | ||
6 | 7 | ||
7 | config TCG_TPM | 8 | config TCG_TPM |
8 | tristate "TPM Hardware Support" | 9 | tristate "TPM Hardware Support" |
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig index f4c634504d1a..e678a33ea672 100644 --- a/drivers/crypto/Kconfig +++ b/drivers/crypto/Kconfig | |||
@@ -56,4 +56,26 @@ config CRYPTO_DEV_GEODE | |||
56 | To compile this driver as a module, choose M here: the module | 56 | To compile this driver as a module, choose M here: the module |
57 | will be called geode-aes. | 57 | will be called geode-aes. |
58 | 58 | ||
59 | config ZCRYPT | ||
60 | tristate "Support for PCI-attached cryptographic adapters" | ||
61 | depends on S390 | ||
62 | select ZCRYPT_MONOLITHIC if ZCRYPT="y" | ||
63 | default "m" | ||
64 | help | ||
65 | Select this option if you want to use a PCI-attached cryptographic | ||
66 | adapter like: | ||
67 | + PCI Cryptographic Accelerator (PCICA) | ||
68 | + PCI Cryptographic Coprocessor (PCICC) | ||
69 | + PCI-X Cryptographic Coprocessor (PCIXCC) | ||
70 | + Crypto Express2 Coprocessor (CEX2C) | ||
71 | + Crypto Express2 Accelerator (CEX2A) | ||
72 | |||
73 | config ZCRYPT_MONOLITHIC | ||
74 | bool "Monolithic zcrypt module" | ||
75 | depends on ZCRYPT="m" | ||
76 | help | ||
77 | Select this option if you want to have a single module z90crypt.ko | ||
78 | that contains all parts of the crypto device driver (ap bus, | ||
79 | request router and all the card drivers). | ||
80 | |||
59 | endmenu | 81 | endmenu |
diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 30d021d1a07c..72be6c63edfc 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig | |||
@@ -3,6 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menu "DMA Engine support" | 5 | menu "DMA Engine support" |
6 | depends on !S390 | ||
6 | 7 | ||
7 | config DMA_ENGINE | 8 | config DMA_ENGINE |
8 | bool "Support for DMA engines" | 9 | bool "Support for DMA engines" |
diff --git a/drivers/edac/Kconfig b/drivers/edac/Kconfig index 4f0898400c6d..807c402df049 100644 --- a/drivers/edac/Kconfig +++ b/drivers/edac/Kconfig | |||
@@ -7,6 +7,7 @@ | |||
7 | # | 7 | # |
8 | 8 | ||
9 | menu 'EDAC - error detection and reporting (RAS) (EXPERIMENTAL)' | 9 | menu 'EDAC - error detection and reporting (RAS) (EXPERIMENTAL)' |
10 | depends on HAS_IOMEM | ||
10 | 11 | ||
11 | config EDAC | 12 | config EDAC |
12 | tristate "EDAC core system error reporting (EXPERIMENTAL)" | 13 | tristate "EDAC core system error reporting (EXPERIMENTAL)" |
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig index 3ba3a5221c41..4d1cb5b855d1 100644 --- a/drivers/hwmon/Kconfig +++ b/drivers/hwmon/Kconfig | |||
@@ -4,6 +4,7 @@ | |||
4 | 4 | ||
5 | menuconfig HWMON | 5 | menuconfig HWMON |
6 | tristate "Hardware Monitoring support" | 6 | tristate "Hardware Monitoring support" |
7 | depends on HAS_IOMEM | ||
7 | default y | 8 | default y |
8 | help | 9 | help |
9 | Hardware monitoring devices let you monitor the hardware health | 10 | Hardware monitoring devices let you monitor the hardware health |
diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index 434a61b415a3..96867347bcbf 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig | |||
@@ -4,6 +4,7 @@ | |||
4 | 4 | ||
5 | menuconfig I2C | 5 | menuconfig I2C |
6 | tristate "I2C support" | 6 | tristate "I2C support" |
7 | depends on HAS_IOMEM | ||
7 | ---help--- | 8 | ---help--- |
8 | I2C (pronounce: I-square-C) is a slow serial bus protocol used in | 9 | I2C (pronounce: I-square-C) is a slow serial bus protocol used in |
9 | many micro controller applications and developed by Philips. SMBus, | 10 | many micro controller applications and developed by Philips. SMBus, |
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 1d06b415ede9..9040809d2c25 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
@@ -7,6 +7,7 @@ | |||
7 | if BLOCK | 7 | if BLOCK |
8 | 8 | ||
9 | menu "ATA/ATAPI/MFM/RLL support" | 9 | menu "ATA/ATAPI/MFM/RLL support" |
10 | depends on HAS_IOMEM | ||
10 | 11 | ||
11 | config IDE | 12 | config IDE |
12 | tristate "ATA/ATAPI/MFM/RLL support" | 13 | tristate "ATA/ATAPI/MFM/RLL support" |
diff --git a/drivers/ieee1394/Kconfig b/drivers/ieee1394/Kconfig index 61d7809a5a26..f21426ad2faa 100644 --- a/drivers/ieee1394/Kconfig +++ b/drivers/ieee1394/Kconfig | |||
@@ -1,4 +1,5 @@ | |||
1 | menu "IEEE 1394 (FireWire) support" | 1 | menu "IEEE 1394 (FireWire) support" |
2 | depends on PCI || BROKEN | ||
2 | 3 | ||
3 | config IEEE1394 | 4 | config IEEE1394 |
4 | tristate "IEEE 1394 (FireWire) support" | 5 | tristate "IEEE 1394 (FireWire) support" |
diff --git a/drivers/infiniband/Kconfig b/drivers/infiniband/Kconfig index 37deaae49190..994decc7bcf2 100644 --- a/drivers/infiniband/Kconfig +++ b/drivers/infiniband/Kconfig | |||
@@ -1,4 +1,5 @@ | |||
1 | menu "InfiniBand support" | 1 | menu "InfiniBand support" |
2 | depends on HAS_IOMEM | ||
2 | 3 | ||
3 | config INFINIBAND | 4 | config INFINIBAND |
4 | depends on PCI || BROKEN | 5 | depends on PCI || BROKEN |
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 0e9b69535ad6..f814fb3a469d 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig | |||
@@ -3,6 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menu "Input device support" | 5 | menu "Input device support" |
6 | depends on !S390 | ||
6 | 7 | ||
7 | config INPUT | 8 | config INPUT |
8 | tristate "Generic input layer (needed for keyboard, mouse, ...)" if EMBEDDED | 9 | tristate "Generic input layer (needed for keyboard, mouse, ...)" if EMBEDDED |
diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig index c90afeea54aa..d42fe89cddf6 100644 --- a/drivers/isdn/Kconfig +++ b/drivers/isdn/Kconfig | |||
@@ -3,6 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menu "ISDN subsystem" | 5 | menu "ISDN subsystem" |
6 | depends on !S390 | ||
6 | 7 | ||
7 | config ISDN | 8 | config ISDN |
8 | tristate "ISDN support" | 9 | tristate "ISDN support" |
diff --git a/drivers/kvm/Kconfig b/drivers/kvm/Kconfig index 703cc88d1ef9..e8e37d826478 100644 --- a/drivers/kvm/Kconfig +++ b/drivers/kvm/Kconfig | |||
@@ -2,6 +2,7 @@ | |||
2 | # KVM configuration | 2 | # KVM configuration |
3 | # | 3 | # |
4 | menu "Virtualization" | 4 | menu "Virtualization" |
5 | depends on X86 | ||
5 | 6 | ||
6 | config KVM | 7 | config KVM |
7 | tristate "Kernel-based Virtual Machine (KVM) support" | 8 | tristate "Kernel-based Virtual Machine (KVM) support" |
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 80acd08f0e97..87d2046f866c 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig | |||
@@ -1,5 +1,6 @@ | |||
1 | 1 | ||
2 | menu "LED devices" | 2 | menu "LED devices" |
3 | depends on HAS_IOMEM | ||
3 | 4 | ||
4 | config NEW_LEDS | 5 | config NEW_LEDS |
5 | bool "LED Support" | 6 | bool "LED Support" |
diff --git a/drivers/media/Kconfig b/drivers/media/Kconfig index 91d25798ae4a..3a80e0cc7369 100644 --- a/drivers/media/Kconfig +++ b/drivers/media/Kconfig | |||
@@ -3,6 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menu "Multimedia devices" | 5 | menu "Multimedia devices" |
6 | depends on HAS_IOMEM | ||
6 | 7 | ||
7 | config VIDEO_DEV | 8 | config VIDEO_DEV |
8 | tristate "Video For Linux" | 9 | tristate "Video For Linux" |
diff --git a/drivers/message/fusion/Kconfig b/drivers/message/fusion/Kconfig index 71037f91c222..c88cc75ab49b 100644 --- a/drivers/message/fusion/Kconfig +++ b/drivers/message/fusion/Kconfig | |||
@@ -1,5 +1,6 @@ | |||
1 | 1 | ||
2 | menu "Fusion MPT device support" | 2 | menu "Fusion MPT device support" |
3 | depends on PCI | ||
3 | 4 | ||
4 | config FUSION | 5 | config FUSION |
5 | bool | 6 | bool |
diff --git a/drivers/message/i2o/Kconfig b/drivers/message/i2o/Kconfig index 6443392bffff..f4ac21e5771e 100644 --- a/drivers/message/i2o/Kconfig +++ b/drivers/message/i2o/Kconfig | |||
@@ -1,5 +1,6 @@ | |||
1 | 1 | ||
2 | menu "I2O device support" | 2 | menu "I2O device support" |
3 | depends on PCI | ||
3 | 4 | ||
4 | config I2O | 5 | config I2O |
5 | tristate "I2O support" | 6 | tristate "I2O support" |
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index ab6e985275b2..a20a51efe118 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig | |||
@@ -3,6 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menu "Multifunction device drivers" | 5 | menu "Multifunction device drivers" |
6 | depends on HAS_IOMEM | ||
6 | 7 | ||
7 | config MFD_SM501 | 8 | config MFD_SM501 |
8 | tristate "Support for Silicon Motion SM501" | 9 | tristate "Support for Silicon Motion SM501" |
diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 45b7d53b949c..c0b41e8bcd9d 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig | |||
@@ -4,6 +4,7 @@ | |||
4 | 4 | ||
5 | menuconfig MMC | 5 | menuconfig MMC |
6 | tristate "MMC/SD card support" | 6 | tristate "MMC/SD card support" |
7 | depends on HAS_IOMEM | ||
7 | help | 8 | help |
8 | MMC is the "multi-media card" bus protocol. | 9 | MMC is the "multi-media card" bus protocol. |
9 | 10 | ||
diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index c1b47db29bd2..fbec8cd55e38 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig | |||
@@ -2,6 +2,7 @@ | |||
2 | 2 | ||
3 | menuconfig MTD | 3 | menuconfig MTD |
4 | tristate "Memory Technology Device (MTD) support" | 4 | tristate "Memory Technology Device (MTD) support" |
5 | depends on HAS_IOMEM | ||
5 | help | 6 | help |
6 | Memory Technology Devices are flash, RAM and similar chips, often | 7 | Memory Technology Devices are flash, RAM and similar chips, often |
7 | used for solid state file systems on embedded devices. This option | 8 | used for solid state file systems on embedded devices. This option |
diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig index f994f129f3d8..c0d3101eb6a0 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig | |||
@@ -3,6 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menu "PHY device support" | 5 | menu "PHY device support" |
6 | depends on !S390 | ||
6 | 7 | ||
7 | config PHYLIB | 8 | config PHYLIB |
8 | tristate "PHY Device support and infrastructure" | 9 | tristate "PHY Device support and infrastructure" |
diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig index e273347dc606..e3f5bb0fe603 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig | |||
@@ -3,6 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menu "Wireless LAN" | 5 | menu "Wireless LAN" |
6 | depends on !S390 | ||
6 | 7 | ||
7 | config WLAN_PRE80211 | 8 | config WLAN_PRE80211 |
8 | bool "Wireless LAN (pre-802.11)" | 9 | bool "Wireless LAN (pre-802.11)" |
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig index 36c6a1bfe558..f46c69e4ed82 100644 --- a/drivers/parport/Kconfig +++ b/drivers/parport/Kconfig | |||
@@ -6,6 +6,7 @@ | |||
6 | # | 6 | # |
7 | 7 | ||
8 | menu "Parallel port support" | 8 | menu "Parallel port support" |
9 | depends on HAS_IOMEM | ||
9 | 10 | ||
10 | config PARPORT | 11 | config PARPORT |
11 | tristate "Parallel port support" | 12 | tristate "Parallel port support" |
diff --git a/drivers/pnp/Kconfig b/drivers/pnp/Kconfig index c5143201419a..1959cef8e9de 100644 --- a/drivers/pnp/Kconfig +++ b/drivers/pnp/Kconfig | |||
@@ -3,6 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menu "Plug and Play support" | 5 | menu "Plug and Play support" |
6 | depends on HAS_IOMEM | ||
6 | 7 | ||
7 | config PNP | 8 | config PNP |
8 | bool "Plug and Play support" | 9 | bool "Plug and Play support" |
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 76422eded36e..1759baad439c 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
@@ -3,6 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menu "Real Time Clock" | 5 | menu "Real Time Clock" |
6 | depends on !S390 | ||
6 | 7 | ||
7 | config RTC_LIB | 8 | config RTC_LIB |
8 | tristate | 9 | tristate |
diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig index b250c5354503..e879b212cf43 100644 --- a/drivers/s390/block/Kconfig +++ b/drivers/s390/block/Kconfig | |||
@@ -1,11 +1,9 @@ | |||
1 | if S390 && BLOCK | ||
2 | |||
3 | comment "S/390 block device drivers" | 1 | comment "S/390 block device drivers" |
4 | depends on S390 | 2 | depends on S390 && BLOCK |
5 | 3 | ||
6 | config BLK_DEV_XPRAM | 4 | config BLK_DEV_XPRAM |
7 | tristate "XPRAM disk support" | 5 | tristate "XPRAM disk support" |
8 | depends on S390 | 6 | depends on S390 && BLOCK |
9 | help | 7 | help |
10 | Select this option if you want to use your expanded storage on S/390 | 8 | Select this option if you want to use your expanded storage on S/390 |
11 | or zSeries as a disk. This is useful as a _fast_ swap device if you | 9 | or zSeries as a disk. This is useful as a _fast_ swap device if you |
@@ -15,12 +13,13 @@ config BLK_DEV_XPRAM | |||
15 | 13 | ||
16 | config DCSSBLK | 14 | config DCSSBLK |
17 | tristate "DCSSBLK support" | 15 | tristate "DCSSBLK support" |
16 | depends on S390 && BLOCK | ||
18 | help | 17 | help |
19 | Support for dcss block device | 18 | Support for dcss block device |
20 | 19 | ||
21 | config DASD | 20 | config DASD |
22 | tristate "Support for DASD devices" | 21 | tristate "Support for DASD devices" |
23 | depends on CCW | 22 | depends on CCW && BLOCK |
24 | help | 23 | help |
25 | Enable this option if you want to access DASDs directly utilizing | 24 | Enable this option if you want to access DASDs directly utilizing |
26 | S/390s channel subsystem commands. This is necessary for running | 25 | S/390s channel subsystem commands. This is necessary for running |
@@ -62,5 +61,3 @@ config DASD_EER | |||
62 | This driver provides a character device interface to the | 61 | This driver provides a character device interface to the |
63 | DASD extended error reporting. This is only needed if you want to | 62 | DASD extended error reporting. This is only needed if you want to |
64 | use applications written for the EER facility. | 63 | use applications written for the EER facility. |
65 | |||
66 | endif | ||
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index 977521013fe8..bfeca57098fa 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c | |||
@@ -2174,9 +2174,10 @@ dasd_generic_notify(struct ccw_device *cdev, int event) | |||
2174 | return ret; | 2174 | return ret; |
2175 | } | 2175 | } |
2176 | 2176 | ||
2177 | struct dasd_ccw_req * dasd_generic_build_rdc(struct dasd_device *device, | 2177 | static struct dasd_ccw_req *dasd_generic_build_rdc(struct dasd_device *device, |
2178 | void *rdc_buffer, | 2178 | void *rdc_buffer, |
2179 | int rdc_buffer_size, char *magic) | 2179 | int rdc_buffer_size, |
2180 | char *magic) | ||
2180 | { | 2181 | { |
2181 | struct dasd_ccw_req *cqr; | 2182 | struct dasd_ccw_req *cqr; |
2182 | struct ccw1 *ccw; | 2183 | struct ccw1 *ccw; |
@@ -2219,6 +2220,7 @@ int dasd_generic_read_dev_chars(struct dasd_device *device, char *magic, | |||
2219 | dasd_sfree_request(cqr, cqr->device); | 2220 | dasd_sfree_request(cqr, cqr->device); |
2220 | return ret; | 2221 | return ret; |
2221 | } | 2222 | } |
2223 | EXPORT_SYMBOL_GPL(dasd_generic_read_dev_chars); | ||
2222 | 2224 | ||
2223 | static int __init | 2225 | static int __init |
2224 | dasd_init(void) | 2226 | dasd_init(void) |
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c index e810e4a44ed4..eccac1c3b71b 100644 --- a/drivers/s390/block/dasd_diag.c +++ b/drivers/s390/block/dasd_diag.c | |||
@@ -50,6 +50,7 @@ struct dasd_diag_private { | |||
50 | struct dasd_diag_rw_io iob; | 50 | struct dasd_diag_rw_io iob; |
51 | struct dasd_diag_init_io iib; | 51 | struct dasd_diag_init_io iib; |
52 | blocknum_t pt_block; | 52 | blocknum_t pt_block; |
53 | struct ccw_dev_id dev_id; | ||
53 | }; | 54 | }; |
54 | 55 | ||
55 | struct dasd_diag_req { | 56 | struct dasd_diag_req { |
@@ -102,7 +103,7 @@ mdsk_init_io(struct dasd_device *device, unsigned int blocksize, | |||
102 | iib = &private->iib; | 103 | iib = &private->iib; |
103 | memset(iib, 0, sizeof (struct dasd_diag_init_io)); | 104 | memset(iib, 0, sizeof (struct dasd_diag_init_io)); |
104 | 105 | ||
105 | iib->dev_nr = _ccw_device_get_device_number(device->cdev); | 106 | iib->dev_nr = private->dev_id.devno; |
106 | iib->block_size = blocksize; | 107 | iib->block_size = blocksize; |
107 | iib->offset = offset; | 108 | iib->offset = offset; |
108 | iib->flaga = DASD_DIAG_FLAGA_DEFAULT; | 109 | iib->flaga = DASD_DIAG_FLAGA_DEFAULT; |
@@ -127,7 +128,7 @@ mdsk_term_io(struct dasd_device * device) | |||
127 | private = (struct dasd_diag_private *) device->private; | 128 | private = (struct dasd_diag_private *) device->private; |
128 | iib = &private->iib; | 129 | iib = &private->iib; |
129 | memset(iib, 0, sizeof (struct dasd_diag_init_io)); | 130 | memset(iib, 0, sizeof (struct dasd_diag_init_io)); |
130 | iib->dev_nr = _ccw_device_get_device_number(device->cdev); | 131 | iib->dev_nr = private->dev_id.devno; |
131 | rc = dia250(iib, TERM_BIO); | 132 | rc = dia250(iib, TERM_BIO); |
132 | return rc; | 133 | return rc; |
133 | } | 134 | } |
@@ -166,7 +167,7 @@ dasd_start_diag(struct dasd_ccw_req * cqr) | |||
166 | private = (struct dasd_diag_private *) device->private; | 167 | private = (struct dasd_diag_private *) device->private; |
167 | dreq = (struct dasd_diag_req *) cqr->data; | 168 | dreq = (struct dasd_diag_req *) cqr->data; |
168 | 169 | ||
169 | private->iob.dev_nr = _ccw_device_get_device_number(device->cdev); | 170 | private->iob.dev_nr = private->dev_id.devno; |
170 | private->iob.key = 0; | 171 | private->iob.key = 0; |
171 | private->iob.flags = DASD_DIAG_RWFLAG_ASYNC; | 172 | private->iob.flags = DASD_DIAG_RWFLAG_ASYNC; |
172 | private->iob.block_count = dreq->block_count; | 173 | private->iob.block_count = dreq->block_count; |
@@ -323,11 +324,12 @@ dasd_diag_check_device(struct dasd_device *device) | |||
323 | "memory allocation failed for private data"); | 324 | "memory allocation failed for private data"); |
324 | return -ENOMEM; | 325 | return -ENOMEM; |
325 | } | 326 | } |
327 | ccw_device_get_id(device->cdev, &private->dev_id); | ||
326 | device->private = (void *) private; | 328 | device->private = (void *) private; |
327 | } | 329 | } |
328 | /* Read Device Characteristics */ | 330 | /* Read Device Characteristics */ |
329 | rdc_data = (void *) &(private->rdc_data); | 331 | rdc_data = (void *) &(private->rdc_data); |
330 | rdc_data->dev_nr = _ccw_device_get_device_number(device->cdev); | 332 | rdc_data->dev_nr = private->dev_id.devno; |
331 | rdc_data->rdc_len = sizeof (struct dasd_diag_characteristics); | 333 | rdc_data->rdc_len = sizeof (struct dasd_diag_characteristics); |
332 | 334 | ||
333 | rc = diag210((struct diag210 *) rdc_data); | 335 | rc = diag210((struct diag210 *) rdc_data); |
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c index c9583fbc2a7d..418b4e63a4fa 100644 --- a/drivers/s390/block/dasd_eckd.c +++ b/drivers/s390/block/dasd_eckd.c | |||
@@ -450,9 +450,9 @@ dasd_eckd_generate_uid(struct dasd_device *device, struct dasd_uid *uid) | |||
450 | return 0; | 450 | return 0; |
451 | } | 451 | } |
452 | 452 | ||
453 | struct dasd_ccw_req * dasd_eckd_build_rcd_lpm(struct dasd_device *device, | 453 | static struct dasd_ccw_req *dasd_eckd_build_rcd_lpm(struct dasd_device *device, |
454 | void *rcd_buffer, | 454 | void *rcd_buffer, |
455 | struct ciw *ciw, __u8 lpm) | 455 | struct ciw *ciw, __u8 lpm) |
456 | { | 456 | { |
457 | struct dasd_ccw_req *cqr; | 457 | struct dasd_ccw_req *cqr; |
458 | struct ccw1 *ccw; | 458 | struct ccw1 *ccw; |
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c index 758cfb542865..672eb0a3dd0b 100644 --- a/drivers/s390/block/dasd_ioctl.c +++ b/drivers/s390/block/dasd_ioctl.c | |||
@@ -255,6 +255,7 @@ dasd_ioctl_information(struct dasd_device *device, | |||
255 | unsigned long flags; | 255 | unsigned long flags; |
256 | int rc; | 256 | int rc; |
257 | struct ccw_device *cdev; | 257 | struct ccw_device *cdev; |
258 | struct ccw_dev_id dev_id; | ||
258 | 259 | ||
259 | if (!device->discipline->fill_info) | 260 | if (!device->discipline->fill_info) |
260 | return -EINVAL; | 261 | return -EINVAL; |
@@ -270,8 +271,9 @@ dasd_ioctl_information(struct dasd_device *device, | |||
270 | } | 271 | } |
271 | 272 | ||
272 | cdev = device->cdev; | 273 | cdev = device->cdev; |
274 | ccw_device_get_id(cdev, &dev_id); | ||
273 | 275 | ||
274 | dasd_info->devno = _ccw_device_get_device_number(device->cdev); | 276 | dasd_info->devno = dev_id.devno; |
275 | dasd_info->schid = _ccw_device_get_subchannel_number(device->cdev); | 277 | dasd_info->schid = _ccw_device_get_subchannel_number(device->cdev); |
276 | dasd_info->cu_type = cdev->id.cu_type; | 278 | dasd_info->cu_type = cdev->id.cu_type; |
277 | dasd_info->cu_model = cdev->id.cu_model; | 279 | dasd_info->cu_model = cdev->id.cu_model; |
diff --git a/drivers/s390/Kconfig b/drivers/s390/char/Kconfig index 165af398fdea..66102a184322 100644 --- a/drivers/s390/Kconfig +++ b/drivers/s390/char/Kconfig | |||
@@ -1,69 +1,9 @@ | |||
1 | config CCW | ||
2 | bool | ||
3 | default y | ||
4 | |||
5 | source "drivers/block/Kconfig" | ||
6 | |||
7 | source "drivers/md/Kconfig" | ||
8 | |||
9 | |||
10 | menu "Character device drivers" | ||
11 | |||
12 | config UNIX98_PTYS | ||
13 | bool "Unix98 PTY support" | ||
14 | ---help--- | ||
15 | A pseudo terminal (PTY) is a software device consisting of two | ||
16 | halves: a master and a slave. The slave device behaves identical to | ||
17 | a physical terminal; the master device is used by a process to | ||
18 | read data from and write data to the slave, thereby emulating a | ||
19 | terminal. Typical programs for the master side are telnet servers | ||
20 | and xterms. | ||
21 | |||
22 | Linux has traditionally used the BSD-like names /dev/ptyxx for | ||
23 | masters and /dev/ttyxx for slaves of pseudo terminals. This scheme | ||
24 | has a number of problems. The GNU C library glibc 2.1 and later, | ||
25 | however, supports the Unix98 naming standard: in order to acquire a | ||
26 | pseudo terminal, a process opens /dev/ptmx; the number of the pseudo | ||
27 | terminal is then made available to the process and the pseudo | ||
28 | terminal slave can be accessed as /dev/pts/<number>. What was | ||
29 | traditionally /dev/ttyp2 will then be /dev/pts/2, for example. | ||
30 | |||
31 | The entries in /dev/pts/ are created on the fly by a virtual | ||
32 | file system; therefore, if you say Y here you should say Y to | ||
33 | "/dev/pts file system for Unix98 PTYs" as well. | ||
34 | |||
35 | If you want to say Y here, you need to have the C library glibc 2.1 | ||
36 | or later (equal to libc-6.1, check with "ls -l /lib/libc.so.*"). | ||
37 | Read the instructions in <file:Documentation/Changes> pertaining to | ||
38 | pseudo terminals. It's safe to say N. | ||
39 | |||
40 | config UNIX98_PTY_COUNT | ||
41 | int "Maximum number of Unix98 PTYs in use (0-2048)" | ||
42 | depends on UNIX98_PTYS | ||
43 | default "256" | ||
44 | help | ||
45 | The maximum number of Unix98 PTYs that can be used at any one time. | ||
46 | The default is 256, and should be enough for desktop systems. Server | ||
47 | machines which support incoming telnet/rlogin/ssh connections and/or | ||
48 | serve several X terminals may want to increase this: every incoming | ||
49 | connection and every xterm uses up one PTY. | ||
50 | |||
51 | When not in use, each additional set of 256 PTYs occupy | ||
52 | approximately 8 KB of kernel memory on 32-bit architectures. | ||
53 | |||
54 | config HANGCHECK_TIMER | ||
55 | tristate "Hangcheck timer" | ||
56 | help | ||
57 | The hangcheck-timer module detects when the system has gone | ||
58 | out to lunch past a certain margin. It can reboot the system | ||
59 | or merely print a warning. | ||
60 | |||
61 | source "drivers/char/watchdog/Kconfig" | ||
62 | |||
63 | comment "S/390 character device drivers" | 1 | comment "S/390 character device drivers" |
2 | depends on S390 | ||
64 | 3 | ||
65 | config TN3270 | 4 | config TN3270 |
66 | tristate "Support for locally attached 3270 terminals" | 5 | tristate "Support for locally attached 3270 terminals" |
6 | depends on CCW | ||
67 | help | 7 | help |
68 | Include support for IBM 3270 terminals. | 8 | Include support for IBM 3270 terminals. |
69 | 9 | ||
@@ -88,6 +28,7 @@ config TN3270_CONSOLE | |||
88 | 28 | ||
89 | config TN3215 | 29 | config TN3215 |
90 | bool "Support for 3215 line mode terminal" | 30 | bool "Support for 3215 line mode terminal" |
31 | depends on CCW | ||
91 | help | 32 | help |
92 | Include support for IBM 3215 line-mode terminals. | 33 | Include support for IBM 3215 line-mode terminals. |
93 | 34 | ||
@@ -99,12 +40,19 @@ config TN3215_CONSOLE | |||
99 | Linux system console. | 40 | Linux system console. |
100 | 41 | ||
101 | config CCW_CONSOLE | 42 | config CCW_CONSOLE |
102 | bool | 43 | bool |
103 | depends on TN3215_CONSOLE || TN3270_CONSOLE | 44 | depends on TN3215_CONSOLE || TN3270_CONSOLE |
104 | default y | 45 | default y |
105 | 46 | ||
47 | config SCLP | ||
48 | bool "Support for SCLP" | ||
49 | depends on S390 | ||
50 | help | ||
51 | Include support for the SCLP interface to the service element. | ||
52 | |||
106 | config SCLP_TTY | 53 | config SCLP_TTY |
107 | bool "Support for SCLP line mode terminal" | 54 | bool "Support for SCLP line mode terminal" |
55 | depends on SCLP | ||
108 | help | 56 | help |
109 | Include support for IBM SCLP line-mode terminals. | 57 | Include support for IBM SCLP line-mode terminals. |
110 | 58 | ||
@@ -117,6 +65,7 @@ config SCLP_CONSOLE | |||
117 | 65 | ||
118 | config SCLP_VT220_TTY | 66 | config SCLP_VT220_TTY |
119 | bool "Support for SCLP VT220-compatible terminal" | 67 | bool "Support for SCLP VT220-compatible terminal" |
68 | depends on SCLP | ||
120 | help | 69 | help |
121 | Include support for an IBM SCLP VT220-compatible terminal. | 70 | Include support for an IBM SCLP VT220-compatible terminal. |
122 | 71 | ||
@@ -129,6 +78,7 @@ config SCLP_VT220_CONSOLE | |||
129 | 78 | ||
130 | config SCLP_CPI | 79 | config SCLP_CPI |
131 | tristate "Control-Program Identification" | 80 | tristate "Control-Program Identification" |
81 | depends on SCLP | ||
132 | help | 82 | help |
133 | This option enables the hardware console interface for system | 83 | This option enables the hardware console interface for system |
134 | identification. This is commonly used for workload management and | 84 | identification. This is commonly used for workload management and |
@@ -140,6 +90,7 @@ config SCLP_CPI | |||
140 | 90 | ||
141 | config S390_TAPE | 91 | config S390_TAPE |
142 | tristate "S/390 tape device support" | 92 | tristate "S/390 tape device support" |
93 | depends on CCW | ||
143 | help | 94 | help |
144 | Select this option if you want to access channel-attached tape | 95 | Select this option if you want to access channel-attached tape |
145 | devices on IBM S/390 or zSeries. | 96 | devices on IBM S/390 or zSeries. |
@@ -194,6 +145,7 @@ config VMLOGRDR | |||
194 | 145 | ||
195 | config VMCP | 146 | config VMCP |
196 | tristate "Support for the z/VM CP interface (VM only)" | 147 | tristate "Support for the z/VM CP interface (VM only)" |
148 | depends on S390 | ||
197 | help | 149 | help |
198 | Select this option if you want to be able to interact with the control | 150 | Select this option if you want to be able to interact with the control |
199 | program on z/VM | 151 | program on z/VM |
@@ -207,33 +159,8 @@ config MONREADER | |||
207 | 159 | ||
208 | config MONWRITER | 160 | config MONWRITER |
209 | tristate "API for writing z/VM monitor service records" | 161 | tristate "API for writing z/VM monitor service records" |
162 | depends on S390 | ||
210 | default "m" | 163 | default "m" |
211 | help | 164 | help |
212 | Character device driver for writing z/VM monitor service records | 165 | Character device driver for writing z/VM monitor service records |
213 | 166 | ||
214 | endmenu | ||
215 | |||
216 | menu "Cryptographic devices" | ||
217 | |||
218 | config ZCRYPT | ||
219 | tristate "Support for PCI-attached cryptographic adapters" | ||
220 | select ZCRYPT_MONOLITHIC if ZCRYPT="y" | ||
221 | default "m" | ||
222 | help | ||
223 | Select this option if you want to use a PCI-attached cryptographic | ||
224 | adapter like: | ||
225 | + PCI Cryptographic Accelerator (PCICA) | ||
226 | + PCI Cryptographic Coprocessor (PCICC) | ||
227 | + PCI-X Cryptographic Coprocessor (PCIXCC) | ||
228 | + Crypto Express2 Coprocessor (CEX2C) | ||
229 | + Crypto Express2 Accelerator (CEX2A) | ||
230 | |||
231 | config ZCRYPT_MONOLITHIC | ||
232 | bool "Monolithic zcrypt module" | ||
233 | depends on ZCRYPT="m" | ||
234 | help | ||
235 | Select this option if you want to have a single module z90crypt.ko | ||
236 | that contains all parts of the crypto device driver (ap bus, | ||
237 | request router and all the card drivers). | ||
238 | |||
239 | endmenu | ||
diff --git a/drivers/s390/char/monreader.c b/drivers/s390/char/monreader.c index 8df7b1323c05..67009bfa093e 100644 --- a/drivers/s390/char/monreader.c +++ b/drivers/s390/char/monreader.c | |||
@@ -97,7 +97,7 @@ static u8 user_data_sever[16] = { | |||
97 | * Create the 8 bytes EBCDIC DCSS segment name from | 97 | * Create the 8 bytes EBCDIC DCSS segment name from |
98 | * an ASCII name, incl. padding | 98 | * an ASCII name, incl. padding |
99 | */ | 99 | */ |
100 | static inline void dcss_mkname(char *ascii_name, char *ebcdic_name) | 100 | static void dcss_mkname(char *ascii_name, char *ebcdic_name) |
101 | { | 101 | { |
102 | int i; | 102 | int i; |
103 | 103 | ||
@@ -191,7 +191,7 @@ static inline u32 mon_rec_end(struct mon_msg *monmsg) | |||
191 | return *((u32 *) (mon_mca_start(monmsg) + monmsg->mca_offset + 8)); | 191 | return *((u32 *) (mon_mca_start(monmsg) + monmsg->mca_offset + 8)); |
192 | } | 192 | } |
193 | 193 | ||
194 | static inline int mon_check_mca(struct mon_msg *monmsg) | 194 | static int mon_check_mca(struct mon_msg *monmsg) |
195 | { | 195 | { |
196 | if ((mon_rec_end(monmsg) <= mon_rec_start(monmsg)) || | 196 | if ((mon_rec_end(monmsg) <= mon_rec_start(monmsg)) || |
197 | (mon_rec_start(monmsg) < mon_dcss_start) || | 197 | (mon_rec_start(monmsg) < mon_dcss_start) || |
@@ -209,8 +209,8 @@ static inline int mon_check_mca(struct mon_msg *monmsg) | |||
209 | return 0; | 209 | return 0; |
210 | } | 210 | } |
211 | 211 | ||
212 | static inline int mon_send_reply(struct mon_msg *monmsg, | 212 | static int mon_send_reply(struct mon_msg *monmsg, |
213 | struct mon_private *monpriv) | 213 | struct mon_private *monpriv) |
214 | { | 214 | { |
215 | int rc; | 215 | int rc; |
216 | 216 | ||
@@ -236,7 +236,7 @@ static inline int mon_send_reply(struct mon_msg *monmsg, | |||
236 | return 0; | 236 | return 0; |
237 | } | 237 | } |
238 | 238 | ||
239 | static inline void mon_free_mem(struct mon_private *monpriv) | 239 | static void mon_free_mem(struct mon_private *monpriv) |
240 | { | 240 | { |
241 | int i; | 241 | int i; |
242 | 242 | ||
@@ -246,7 +246,7 @@ static inline void mon_free_mem(struct mon_private *monpriv) | |||
246 | kfree(monpriv); | 246 | kfree(monpriv); |
247 | } | 247 | } |
248 | 248 | ||
249 | static inline struct mon_private *mon_alloc_mem(void) | 249 | static struct mon_private *mon_alloc_mem(void) |
250 | { | 250 | { |
251 | int i; | 251 | int i; |
252 | struct mon_private *monpriv; | 252 | struct mon_private *monpriv; |
@@ -307,7 +307,7 @@ static inline void mon_next_mca(struct mon_msg *monmsg) | |||
307 | monmsg->pos = 0; | 307 | monmsg->pos = 0; |
308 | } | 308 | } |
309 | 309 | ||
310 | static inline struct mon_msg *mon_next_message(struct mon_private *monpriv) | 310 | static struct mon_msg *mon_next_message(struct mon_private *monpriv) |
311 | { | 311 | { |
312 | struct mon_msg *monmsg; | 312 | struct mon_msg *monmsg; |
313 | 313 | ||
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c index 8facd14adb7c..f6ef90ee3e7d 100644 --- a/drivers/s390/char/raw3270.c +++ b/drivers/s390/char/raw3270.c | |||
@@ -589,9 +589,10 @@ static int | |||
589 | __raw3270_size_device_vm(struct raw3270 *rp) | 589 | __raw3270_size_device_vm(struct raw3270 *rp) |
590 | { | 590 | { |
591 | int rc, model; | 591 | int rc, model; |
592 | struct ccw_dev_id dev_id; | ||
592 | 593 | ||
593 | raw3270_init_diag210.vrdcdvno = | 594 | ccw_device_get_id(rp->cdev, &dev_id); |
594 | _ccw_device_get_device_number(rp->cdev); | 595 | raw3270_init_diag210.vrdcdvno = dev_id.devno; |
595 | raw3270_init_diag210.vrdclen = sizeof(struct diag210); | 596 | raw3270_init_diag210.vrdclen = sizeof(struct diag210); |
596 | rc = diag210(&raw3270_init_diag210); | 597 | rc = diag210(&raw3270_init_diag210); |
597 | if (rc) | 598 | if (rc) |
diff --git a/drivers/s390/char/sclp.h b/drivers/s390/char/sclp.h index 87ac4a3ad49d..dbb99d1b6f57 100644 --- a/drivers/s390/char/sclp.h +++ b/drivers/s390/char/sclp.h | |||
@@ -132,6 +132,9 @@ int sclp_deactivate(void); | |||
132 | int sclp_reactivate(void); | 132 | int sclp_reactivate(void); |
133 | int sclp_service_call(sclp_cmdw_t command, void *sccb); | 133 | int sclp_service_call(sclp_cmdw_t command, void *sccb); |
134 | 134 | ||
135 | int sclp_sdias_init(void); | ||
136 | void sclp_sdias_exit(void); | ||
137 | |||
135 | /* useful inlines */ | 138 | /* useful inlines */ |
136 | 139 | ||
137 | /* VM uses EBCDIC 037, LPAR+native(SE+HMC) use EBCDIC 500 */ | 140 | /* VM uses EBCDIC 037, LPAR+native(SE+HMC) use EBCDIC 500 */ |
diff --git a/drivers/s390/char/sclp_sdias.c b/drivers/s390/char/sclp_sdias.c index 52283daddaef..1c064976b32b 100644 --- a/drivers/s390/char/sclp_sdias.c +++ b/drivers/s390/char/sclp_sdias.c | |||
@@ -66,9 +66,9 @@ static DEFINE_MUTEX(sdias_mutex); | |||
66 | 66 | ||
67 | static void sdias_callback(struct sclp_req *request, void *data) | 67 | static void sdias_callback(struct sclp_req *request, void *data) |
68 | { | 68 | { |
69 | struct sdias_sccb *sccb; | 69 | struct sdias_sccb *cbsccb; |
70 | 70 | ||
71 | sccb = (struct sdias_sccb *) request->sccb; | 71 | cbsccb = (struct sdias_sccb *) request->sccb; |
72 | sclp_req_done = 1; | 72 | sclp_req_done = 1; |
73 | wake_up(&sdias_wq); /* Inform caller, that request is complete */ | 73 | wake_up(&sdias_wq); /* Inform caller, that request is complete */ |
74 | TRACE("callback done\n"); | 74 | TRACE("callback done\n"); |
@@ -229,7 +229,7 @@ out: | |||
229 | return rc; | 229 | return rc; |
230 | } | 230 | } |
231 | 231 | ||
232 | int __init sdias_init(void) | 232 | int __init sclp_sdias_init(void) |
233 | { | 233 | { |
234 | int rc; | 234 | int rc; |
235 | 235 | ||
@@ -248,7 +248,7 @@ int __init sdias_init(void) | |||
248 | return 0; | 248 | return 0; |
249 | } | 249 | } |
250 | 250 | ||
251 | void __exit sdias_exit(void) | 251 | void __exit sclp_sdias_exit(void) |
252 | { | 252 | { |
253 | debug_unregister(sdias_dbf); | 253 | debug_unregister(sdias_dbf); |
254 | sclp_unregister(&sclp_sdias_register); | 254 | sclp_unregister(&sclp_sdias_register); |
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c index 89d439316a53..66eb0688d523 100644 --- a/drivers/s390/char/zcore.c +++ b/drivers/s390/char/zcore.c | |||
@@ -21,6 +21,7 @@ | |||
21 | #include <asm/debug.h> | 21 | #include <asm/debug.h> |
22 | #include <asm/processor.h> | 22 | #include <asm/processor.h> |
23 | #include <asm/irqflags.h> | 23 | #include <asm/irqflags.h> |
24 | #include "sclp.h" | ||
24 | 25 | ||
25 | #define TRACE(x...) debug_sprintf_event(zcore_dbf, 1, x) | 26 | #define TRACE(x...) debug_sprintf_event(zcore_dbf, 1, x) |
26 | #define MSG(x...) printk( KERN_ALERT x ) | 27 | #define MSG(x...) printk( KERN_ALERT x ) |
@@ -564,8 +565,6 @@ static void __init zcore_header_init(int arch, struct zcore_header *hdr) | |||
564 | get_cpu_id(&hdr->cpu_id); | 565 | get_cpu_id(&hdr->cpu_id); |
565 | } | 566 | } |
566 | 567 | ||
567 | extern int sdias_init(void); | ||
568 | |||
569 | static int __init zcore_init(void) | 568 | static int __init zcore_init(void) |
570 | { | 569 | { |
571 | unsigned char arch; | 570 | unsigned char arch; |
@@ -582,7 +581,7 @@ static int __init zcore_init(void) | |||
582 | TRACE("wwpn: %llx\n", (unsigned long long) ipl_info.data.fcp.wwpn); | 581 | TRACE("wwpn: %llx\n", (unsigned long long) ipl_info.data.fcp.wwpn); |
583 | TRACE("lun: %llx\n", (unsigned long long) ipl_info.data.fcp.lun); | 582 | TRACE("lun: %llx\n", (unsigned long long) ipl_info.data.fcp.lun); |
584 | 583 | ||
585 | rc = sdias_init(); | 584 | rc = sclp_sdias_init(); |
586 | if (rc) | 585 | if (rc) |
587 | goto fail; | 586 | goto fail; |
588 | 587 | ||
@@ -634,12 +633,10 @@ fail: | |||
634 | return rc; | 633 | return rc; |
635 | } | 634 | } |
636 | 635 | ||
637 | extern void sdias_exit(void); | ||
638 | |||
639 | static void __exit zcore_exit(void) | 636 | static void __exit zcore_exit(void) |
640 | { | 637 | { |
641 | debug_unregister(zcore_dbf); | 638 | debug_unregister(zcore_dbf); |
642 | sdias_exit(); | 639 | sclp_sdias_exit(); |
643 | diag308(DIAG308_REL_HSA, NULL); | 640 | diag308(DIAG308_REL_HSA, NULL); |
644 | } | 641 | } |
645 | 642 | ||
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c index 27c6d9e55b23..dfca0ef139fd 100644 --- a/drivers/s390/cio/css.c +++ b/drivers/s390/cio/css.c | |||
@@ -191,8 +191,7 @@ static int css_register_subchannel(struct subchannel *sch) | |||
191 | return ret; | 191 | return ret; |
192 | } | 192 | } |
193 | 193 | ||
194 | int | 194 | static int css_probe_device(struct subchannel_id schid) |
195 | css_probe_device(struct subchannel_id schid) | ||
196 | { | 195 | { |
197 | int ret; | 196 | int ret; |
198 | struct subchannel *sch; | 197 | struct subchannel *sch; |
diff --git a/drivers/s390/cio/css.h b/drivers/s390/cio/css.h index 71fcfdc42800..ed7977531c3f 100644 --- a/drivers/s390/cio/css.h +++ b/drivers/s390/cio/css.h | |||
@@ -138,9 +138,7 @@ struct css_driver { | |||
138 | * all css_drivers have the css_bus_type | 138 | * all css_drivers have the css_bus_type |
139 | */ | 139 | */ |
140 | extern struct bus_type css_bus_type; | 140 | extern struct bus_type css_bus_type; |
141 | extern struct css_driver io_subchannel_driver; | ||
142 | 141 | ||
143 | extern int css_probe_device(struct subchannel_id); | ||
144 | extern int css_sch_device_register(struct subchannel *); | 142 | extern int css_sch_device_register(struct subchannel *); |
145 | extern void css_sch_device_unregister(struct subchannel *); | 143 | extern void css_sch_device_unregister(struct subchannel *); |
146 | extern struct subchannel * get_subchannel_by_schid(struct subchannel_id); | 144 | extern struct subchannel * get_subchannel_by_schid(struct subchannel_id); |
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c index a23ff582db9d..a8b373f69cf0 100644 --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c | |||
@@ -129,7 +129,7 @@ static void io_subchannel_verify(struct device *); | |||
129 | static void io_subchannel_ioterm(struct device *); | 129 | static void io_subchannel_ioterm(struct device *); |
130 | static void io_subchannel_shutdown(struct subchannel *); | 130 | static void io_subchannel_shutdown(struct subchannel *); |
131 | 131 | ||
132 | struct css_driver io_subchannel_driver = { | 132 | static struct css_driver io_subchannel_driver = { |
133 | .subchannel_type = SUBCHANNEL_TYPE_IO, | 133 | .subchannel_type = SUBCHANNEL_TYPE_IO, |
134 | .drv = { | 134 | .drv = { |
135 | .name = "io_subchannel", | 135 | .name = "io_subchannel", |
@@ -546,7 +546,7 @@ static struct attribute_group ccwdev_attr_group = { | |||
546 | .attrs = ccwdev_attrs, | 546 | .attrs = ccwdev_attrs, |
547 | }; | 547 | }; |
548 | 548 | ||
549 | struct attribute_group *ccwdev_attr_groups[] = { | 549 | static struct attribute_group *ccwdev_attr_groups[] = { |
550 | &ccwdev_attr_group, | 550 | &ccwdev_attr_group, |
551 | NULL, | 551 | NULL, |
552 | }; | 552 | }; |
diff --git a/drivers/s390/cio/device_ops.c b/drivers/s390/cio/device_ops.c index 16f59fcb66b1..a5d263fb55ae 100644 --- a/drivers/s390/cio/device_ops.c +++ b/drivers/s390/cio/device_ops.c | |||
@@ -616,6 +616,17 @@ ccw_device_get_chp_desc(struct ccw_device *cdev, int chp_no) | |||
616 | return chp_get_chp_desc(chpid); | 616 | return chp_get_chp_desc(chpid); |
617 | } | 617 | } |
618 | 618 | ||
619 | /** | ||
620 | * ccw_device_get_id - obtain a ccw device id | ||
621 | * @cdev: device to obtain the id for | ||
622 | * @dev_id: where to fill in the values | ||
623 | */ | ||
624 | void ccw_device_get_id(struct ccw_device *cdev, struct ccw_dev_id *dev_id) | ||
625 | { | ||
626 | *dev_id = cdev->private->dev_id; | ||
627 | } | ||
628 | EXPORT_SYMBOL(ccw_device_get_id); | ||
629 | |||
619 | // FIXME: these have to go: | 630 | // FIXME: these have to go: |
620 | 631 | ||
621 | int | 632 | int |
diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c index f770018fe1d5..e70aeb7a3781 100644 --- a/drivers/s390/cio/qdio.c +++ b/drivers/s390/cio/qdio.c | |||
@@ -1983,6 +1983,7 @@ qdio_handle_pci(struct qdio_irq *irq_ptr) | |||
1983 | if (q->is_input_q&QDIO_FLAG_NO_INPUT_INTERRUPT_CONTEXT) | 1983 | if (q->is_input_q&QDIO_FLAG_NO_INPUT_INTERRUPT_CONTEXT) |
1984 | qdio_mark_q(q); | 1984 | qdio_mark_q(q); |
1985 | else { | 1985 | else { |
1986 | qdio_perf_stat_dec(&perf_stats.tl_runs); | ||
1986 | __qdio_inbound_processing(q); | 1987 | __qdio_inbound_processing(q); |
1987 | } | 1988 | } |
1988 | } | 1989 | } |
diff --git a/drivers/s390/net/Kconfig b/drivers/s390/net/Kconfig index f98fa465df0a..eada69dec4fe 100644 --- a/drivers/s390/net/Kconfig +++ b/drivers/s390/net/Kconfig | |||
@@ -3,7 +3,7 @@ menu "S/390 network device drivers" | |||
3 | 3 | ||
4 | config LCS | 4 | config LCS |
5 | tristate "Lan Channel Station Interface" | 5 | tristate "Lan Channel Station Interface" |
6 | depends on NETDEVICES && (NET_ETHERNET || TR || FDDI) | 6 | depends on CCW && NETDEVICES && (NET_ETHERNET || TR || FDDI) |
7 | help | 7 | help |
8 | Select this option if you want to use LCS networking on IBM S/390 | 8 | Select this option if you want to use LCS networking on IBM S/390 |
9 | or zSeries. This device driver supports Token Ring (IEEE 802.5), | 9 | or zSeries. This device driver supports Token Ring (IEEE 802.5), |
@@ -13,7 +13,7 @@ config LCS | |||
13 | 13 | ||
14 | config CTC | 14 | config CTC |
15 | tristate "CTC device support" | 15 | tristate "CTC device support" |
16 | depends on NETDEVICES | 16 | depends on CCW && NETDEVICES |
17 | help | 17 | help |
18 | Select this option if you want to use channel-to-channel networking | 18 | Select this option if you want to use channel-to-channel networking |
19 | on IBM S/390 or zSeries. This device driver supports real CTC | 19 | on IBM S/390 or zSeries. This device driver supports real CTC |
@@ -42,7 +42,7 @@ config SMSGIUCV | |||
42 | 42 | ||
43 | config CLAW | 43 | config CLAW |
44 | tristate "CLAW device support" | 44 | tristate "CLAW device support" |
45 | depends on NETDEVICES | 45 | depends on CCW && NETDEVICES |
46 | help | 46 | help |
47 | This driver supports channel attached CLAW devices. | 47 | This driver supports channel attached CLAW devices. |
48 | CLAW is Common Link Access for Workstation. Common devices | 48 | CLAW is Common Link Access for Workstation. Common devices |
@@ -52,7 +52,7 @@ config CLAW | |||
52 | 52 | ||
53 | config QETH | 53 | config QETH |
54 | tristate "Gigabit Ethernet device support" | 54 | tristate "Gigabit Ethernet device support" |
55 | depends on NETDEVICES && IP_MULTICAST && QDIO | 55 | depends on CCW && NETDEVICES && IP_MULTICAST && QDIO |
56 | help | 56 | help |
57 | This driver supports the IBM S/390 and zSeries OSA Express adapters | 57 | This driver supports the IBM S/390 and zSeries OSA Express adapters |
58 | in QDIO mode (all media types), HiperSockets interfaces and VM GuestLAN | 58 | in QDIO mode (all media types), HiperSockets interfaces and VM GuestLAN |
diff --git a/drivers/s390/net/qeth_mpc.c b/drivers/s390/net/qeth_mpc.c index f54fdfdbf06f..f29a4bc4f6f2 100644 --- a/drivers/s390/net/qeth_mpc.c +++ b/drivers/s390/net/qeth_mpc.c | |||
@@ -162,7 +162,7 @@ struct ipa_rc_msg { | |||
162 | char *msg; | 162 | char *msg; |
163 | }; | 163 | }; |
164 | 164 | ||
165 | struct ipa_rc_msg qeth_ipa_rc_msg[] = { | 165 | static struct ipa_rc_msg qeth_ipa_rc_msg[] = { |
166 | {IPA_RC_SUCCESS, "success"}, | 166 | {IPA_RC_SUCCESS, "success"}, |
167 | {IPA_RC_NOTSUPP, "Command not supported"}, | 167 | {IPA_RC_NOTSUPP, "Command not supported"}, |
168 | {IPA_RC_IP_TABLE_FULL, "Add Addr IP Table Full - ipv6"}, | 168 | {IPA_RC_IP_TABLE_FULL, "Add Addr IP Table Full - ipv6"}, |
@@ -226,7 +226,7 @@ struct ipa_cmd_names { | |||
226 | char *name; | 226 | char *name; |
227 | }; | 227 | }; |
228 | 228 | ||
229 | struct ipa_cmd_names qeth_ipa_cmd_names[] = { | 229 | static struct ipa_cmd_names qeth_ipa_cmd_names[] = { |
230 | {IPA_CMD_STARTLAN, "startlan"}, | 230 | {IPA_CMD_STARTLAN, "startlan"}, |
231 | {IPA_CMD_STOPLAN, "stoplan"}, | 231 | {IPA_CMD_STOPLAN, "stoplan"}, |
232 | {IPA_CMD_SETVMAC, "setvmac"}, | 232 | {IPA_CMD_SETVMAC, "setvmac"}, |
diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c index 324899c96efe..ddff40c4212c 100644 --- a/drivers/s390/scsi/zfcp_aux.c +++ b/drivers/s390/scsi/zfcp_aux.c | |||
@@ -607,8 +607,7 @@ zfcp_sg_list_free(struct zfcp_sg_list *sg_list) | |||
607 | * @sg_count: elements in array | 607 | * @sg_count: elements in array |
608 | * Return: size of entire scatter-gather list | 608 | * Return: size of entire scatter-gather list |
609 | */ | 609 | */ |
610 | size_t | 610 | static size_t zfcp_sg_size(struct scatterlist *sg, unsigned int sg_count) |
611 | zfcp_sg_size(struct scatterlist *sg, unsigned int sg_count) | ||
612 | { | 611 | { |
613 | unsigned int i; | 612 | unsigned int i; |
614 | struct scatterlist *p; | 613 | struct scatterlist *p; |
@@ -975,8 +974,7 @@ zfcp_free_low_mem_buffers(struct zfcp_adapter *adapter) | |||
975 | mempool_destroy(adapter->pool.data_gid_pn); | 974 | mempool_destroy(adapter->pool.data_gid_pn); |
976 | } | 975 | } |
977 | 976 | ||
978 | void | 977 | static void zfcp_dummy_release(struct device *dev) |
979 | zfcp_dummy_release(struct device *dev) | ||
980 | { | 978 | { |
981 | return; | 979 | return; |
982 | } | 980 | } |
@@ -1336,7 +1334,7 @@ zfcp_nameserver_enqueue(struct zfcp_adapter *adapter) | |||
1336 | 1334 | ||
1337 | #define ZFCP_LOG_AREA ZFCP_LOG_AREA_FC | 1335 | #define ZFCP_LOG_AREA ZFCP_LOG_AREA_FC |
1338 | 1336 | ||
1339 | void | 1337 | static void |
1340 | zfcp_fsf_incoming_els_rscn(struct zfcp_adapter *adapter, | 1338 | zfcp_fsf_incoming_els_rscn(struct zfcp_adapter *adapter, |
1341 | struct fsf_status_read_buffer *status_buffer) | 1339 | struct fsf_status_read_buffer *status_buffer) |
1342 | { | 1340 | { |
diff --git a/drivers/s390/scsi/zfcp_dbf.c b/drivers/s390/scsi/zfcp_dbf.c index d8191d115c14..5f3212440f68 100644 --- a/drivers/s390/scsi/zfcp_dbf.c +++ b/drivers/s390/scsi/zfcp_dbf.c | |||
@@ -478,7 +478,7 @@ static struct debug_view zfcp_hba_dbf_view = { | |||
478 | NULL | 478 | NULL |
479 | }; | 479 | }; |
480 | 480 | ||
481 | void | 481 | static void |
482 | _zfcp_san_dbf_event_common_ct(const char *tag, struct zfcp_fsf_req *fsf_req, | 482 | _zfcp_san_dbf_event_common_ct(const char *tag, struct zfcp_fsf_req *fsf_req, |
483 | u32 s_id, u32 d_id, void *buffer, int buflen) | 483 | u32 s_id, u32 d_id, void *buffer, int buflen) |
484 | { | 484 | { |
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index e8efe938c4e7..a6f5bfbb777b 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -5,6 +5,7 @@ | |||
5 | # | 5 | # |
6 | 6 | ||
7 | menu "Serial drivers" | 7 | menu "Serial drivers" |
8 | depends on HAS_IOMEM | ||
8 | 9 | ||
9 | # | 10 | # |
10 | # The new 8250/16550 serial drivers | 11 | # The new 8250/16550 serial drivers |
diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 07c587ec71be..7c9d37f651e3 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig | |||
@@ -6,6 +6,7 @@ | |||
6 | # fully appropriate there, so it'd need some thought to do well. | 6 | # fully appropriate there, so it'd need some thought to do well. |
7 | # | 7 | # |
8 | menu "SPI support" | 8 | menu "SPI support" |
9 | depends on HAS_IOMEM | ||
9 | 10 | ||
10 | config SPI | 11 | config SPI |
11 | bool "SPI support" | 12 | bool "SPI support" |
diff --git a/drivers/telephony/Kconfig b/drivers/telephony/Kconfig index 7625b1816baf..dd1d6a53f3c0 100644 --- a/drivers/telephony/Kconfig +++ b/drivers/telephony/Kconfig | |||
@@ -3,6 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menu "Telephony Support" | 5 | menu "Telephony Support" |
6 | depends on HAS_IOMEM | ||
6 | 7 | ||
7 | config PHONE | 8 | config PHONE |
8 | tristate "Linux telephony support" | 9 | tristate "Linux telephony support" |
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig index 278a22cea5bf..15499b7e33f4 100644 --- a/drivers/usb/Kconfig +++ b/drivers/usb/Kconfig | |||
@@ -3,6 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menu "USB support" | 5 | menu "USB support" |
6 | depends on HAS_IOMEM | ||
6 | 7 | ||
7 | # Host-side USB depends on having a host controller | 8 | # Host-side USB depends on having a host controller |
8 | # NOTE: dummy_hcd is always an option, but it's ignored here ... | 9 | # NOTE: dummy_hcd is always an option, but it's ignored here ... |
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 9a256d2ff9dc..f54438828cb9 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -3,6 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menu "Graphics support" | 5 | menu "Graphics support" |
6 | depends on HAS_IOMEM | ||
6 | 7 | ||
7 | source "drivers/video/backlight/Kconfig" | 8 | source "drivers/video/backlight/Kconfig" |
8 | source "drivers/video/display/Kconfig" | 9 | source "drivers/video/display/Kconfig" |
diff --git a/drivers/w1/Kconfig b/drivers/w1/Kconfig index c287a9ae4fdd..ca75b3ad3a2e 100644 --- a/drivers/w1/Kconfig +++ b/drivers/w1/Kconfig | |||
@@ -1,4 +1,5 @@ | |||
1 | menu "Dallas's 1-wire bus" | 1 | menu "Dallas's 1-wire bus" |
2 | depends on HAS_IOMEM | ||
2 | 3 | ||
3 | config W1 | 4 | config W1 |
4 | tristate "Dallas's 1-wire support" | 5 | tristate "Dallas's 1-wire support" |