diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2007-05-10 09:45:59 -0400 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2007-05-10 09:46:08 -0400 |
| commit | abf3ea1b549afc62dc7304fddab1cdaf23d0cc84 (patch) | |
| tree | 191b166cc4e97a560fd7f164e380e1bace762312 | |
| parent | 9556fb73edfc37410cab3b47ae5e94bcecd8edf2 (diff) | |
[S390] Kconfig: common config options for s390.
Disable some configuration options in the common Kconfig files that
are of no interest to a s390 machine. Enable hangcheck timer.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
| -rw-r--r-- | drivers/char/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 715250077e44..7ff85ad62806 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--- |
| @@ -766,7 +767,7 @@ config NVRAM | |||
| 766 | 767 | ||
| 767 | config RTC | 768 | config RTC |
| 768 | tristate "Enhanced Real Time Clock Support" | 769 | tristate "Enhanced Real Time Clock Support" |
| 769 | depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM && !SUPERH | 770 | depends on !PPC && !PARISC && !IA64 && !M68K && (!SPARC || PCI) && !FRV && !ARM && !SUPERH && !S390 |
| 770 | ---help--- | 771 | ---help--- |
| 771 | 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 |
| 772 | 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 |
| @@ -814,7 +815,7 @@ config SGI_IP27_RTC | |||
| 814 | 815 | ||
| 815 | config GEN_RTC | 816 | config GEN_RTC |
| 816 | tristate "Generic /dev/rtc emulation" | 817 | tristate "Generic /dev/rtc emulation" |
| 817 | depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV | 818 | depends on RTC!=y && !IA64 && !ARM && !M32R && !SPARC && !FRV && !S390 |
| 818 | ---help--- | 819 | ---help--- |
| 819 | 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 |
| 820 | 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 |
| @@ -1045,7 +1046,7 @@ config HPET_MMAP | |||
| 1045 | 1046 | ||
| 1046 | config HANGCHECK_TIMER | 1047 | config HANGCHECK_TIMER |
| 1047 | tristate "Hangcheck timer" | 1048 | tristate "Hangcheck timer" |
| 1048 | depends on X86 || IA64 || PPC64 | 1049 | depends on X86 || IA64 || PPC64 || S390 |
| 1049 | help | 1050 | help |
| 1050 | The hangcheck-timer module detects when the system has gone | 1051 | The hangcheck-timer module detects when the system has gone |
| 1051 | 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 |
