diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 15:11:59 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2011-11-02 09:15:41 -0400 |
commit | 3369465ed1a6a9aa9b885a6d7d8e074ecbd782da (patch) | |
tree | ac60be76e1d363caab63156c1390f1ab0c4ee96c /drivers | |
parent | c039aff672a540f8976770e74599d350de1805cb (diff) |
um: switch to use of drivers/Kconfig
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/Kconfig | 6 | ||||
-rw-r--r-- | drivers/char/ttyprintk.c | 2 | ||||
-rw-r--r-- | drivers/input/Kconfig | 2 | ||||
-rw-r--r-- | drivers/isdn/Kconfig | 2 | ||||
-rw-r--r-- | drivers/power/Kconfig | 1 | ||||
-rw-r--r-- | drivers/rtc/Kconfig | 2 | ||||
-rw-r--r-- | drivers/tty/Kconfig | 2 | ||||
-rw-r--r-- | drivers/watchdog/Kconfig | 2 |
8 files changed, 10 insertions, 9 deletions
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig index 423fd56bf612..43643033a3ae 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig | |||
@@ -298,7 +298,7 @@ if RTC_LIB=n | |||
298 | config RTC | 298 | config RTC |
299 | tristate "Enhanced Real Time Clock Support (legacy PC RTC driver)" | 299 | tristate "Enhanced Real Time Clock Support (legacy PC RTC driver)" |
300 | depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV \ | 300 | depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV \ |
301 | && !ARM && !SUPERH && !S390 && !AVR32 && !BLACKFIN | 301 | && !ARM && !SUPERH && !S390 && !AVR32 && !BLACKFIN && !UML |
302 | ---help--- | 302 | ---help--- |
303 | If you say Y here and create a character special file /dev/rtc with | 303 | If you say Y here and create a character special file /dev/rtc with |
304 | major number 10 and minor number 135 using mknod ("man mknod"), you | 304 | major number 10 and minor number 135 using mknod ("man mknod"), you |
@@ -346,7 +346,7 @@ config JS_RTC | |||
346 | 346 | ||
347 | config GEN_RTC | 347 | config GEN_RTC |
348 | tristate "Generic /dev/rtc emulation" | 348 | tristate "Generic /dev/rtc emulation" |
349 | depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH && !AVR32 && !BLACKFIN | 349 | depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH && !AVR32 && !BLACKFIN && !UML |
350 | ---help--- | 350 | ---help--- |
351 | If you say Y here and create a character special file /dev/rtc with | 351 | If you say Y here and create a character special file /dev/rtc with |
352 | major number 10 and minor number 135 using mknod ("man mknod"), you | 352 | major number 10 and minor number 135 using mknod ("man mknod"), you |
@@ -490,7 +490,7 @@ config SCx200_GPIO | |||
490 | 490 | ||
491 | config PC8736x_GPIO | 491 | config PC8736x_GPIO |
492 | tristate "NatSemi PC8736x GPIO Support" | 492 | tristate "NatSemi PC8736x GPIO Support" |
493 | depends on X86_32 | 493 | depends on X86_32 && !UML |
494 | default SCx200_GPIO # mostly N | 494 | default SCx200_GPIO # mostly N |
495 | select NSC_GPIO # needed for support routines | 495 | select NSC_GPIO # needed for support routines |
496 | help | 496 | help |
diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c index a1f68af4ccf4..f22861511909 100644 --- a/drivers/char/ttyprintk.c +++ b/drivers/char/ttyprintk.c | |||
@@ -170,7 +170,7 @@ static const struct tty_operations ttyprintk_ops = { | |||
170 | .ioctl = tpk_ioctl, | 170 | .ioctl = tpk_ioctl, |
171 | }; | 171 | }; |
172 | 172 | ||
173 | struct tty_port_operations null_ops = { }; | 173 | static struct tty_port_operations null_ops = { }; |
174 | 174 | ||
175 | static struct tty_driver *ttyprintk_driver; | 175 | static struct tty_driver *ttyprintk_driver; |
176 | 176 | ||
diff --git a/drivers/input/Kconfig b/drivers/input/Kconfig index 23e82e46656d..001b147c7f95 100644 --- a/drivers/input/Kconfig +++ b/drivers/input/Kconfig | |||
@@ -3,7 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | menu "Input device support" | 5 | menu "Input device support" |
6 | depends on !S390 | 6 | depends on !S390 && !UML |
7 | 7 | ||
8 | config INPUT | 8 | config INPUT |
9 | tristate "Generic input layer (needed for keyboard, mouse, ...)" if EXPERT | 9 | tristate "Generic input layer (needed for keyboard, mouse, ...)" if EXPERT |
diff --git a/drivers/isdn/Kconfig b/drivers/isdn/Kconfig index 4fb601670de3..a233ed53913a 100644 --- a/drivers/isdn/Kconfig +++ b/drivers/isdn/Kconfig | |||
@@ -5,7 +5,7 @@ | |||
5 | menuconfig ISDN | 5 | menuconfig ISDN |
6 | bool "ISDN support" | 6 | bool "ISDN support" |
7 | depends on NET | 7 | depends on NET |
8 | depends on !S390 | 8 | depends on !S390 && !UML |
9 | ---help--- | 9 | ---help--- |
10 | ISDN ("Integrated Services Digital Network", called RNIS in France) | 10 | ISDN ("Integrated Services Digital Network", called RNIS in France) |
11 | is a fully digital telephone service that can be used for voice and | 11 | is a fully digital telephone service that can be used for voice and |
diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig index 57de051a74b3..9f88641e67f9 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig | |||
@@ -70,6 +70,7 @@ config BATTERY_DS2760 | |||
70 | 70 | ||
71 | config BATTERY_DS2780 | 71 | config BATTERY_DS2780 |
72 | tristate "DS2780 battery driver" | 72 | tristate "DS2780 battery driver" |
73 | depends on HAS_IOMEM | ||
73 | select W1 | 74 | select W1 |
74 | select W1_SLAVE_DS2780 | 75 | select W1_SLAVE_DS2780 |
75 | help | 76 | help |
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig index 5a538fc1cc85..53eb4e55b289 100644 --- a/drivers/rtc/Kconfig +++ b/drivers/rtc/Kconfig | |||
@@ -8,7 +8,7 @@ config RTC_LIB | |||
8 | menuconfig RTC_CLASS | 8 | menuconfig RTC_CLASS |
9 | bool "Real Time Clock" | 9 | bool "Real Time Clock" |
10 | default n | 10 | default n |
11 | depends on !S390 | 11 | depends on !S390 && !UML |
12 | select RTC_LIB | 12 | select RTC_LIB |
13 | help | 13 | help |
14 | Generic RTC class support. If you say yes here, you will | 14 | Generic RTC class support. If you say yes here, you will |
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig index bd7cc0527999..aa07914a9cba 100644 --- a/drivers/tty/Kconfig +++ b/drivers/tty/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config VT | 1 | config VT |
2 | bool "Virtual terminal" if EXPERT | 2 | bool "Virtual terminal" if EXPERT |
3 | depends on !S390 | 3 | depends on !S390 && !UML |
4 | select INPUT | 4 | select INPUT |
5 | default y | 5 | default y |
6 | ---help--- | 6 | ---help--- |
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 340b2b3e15d6..64c6752ea2c6 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig | |||
@@ -726,7 +726,7 @@ config SBC8360_WDT | |||
726 | 726 | ||
727 | config SBC7240_WDT | 727 | config SBC7240_WDT |
728 | tristate "SBC Nano 7240 Watchdog Timer" | 728 | tristate "SBC Nano 7240 Watchdog Timer" |
729 | depends on X86_32 | 729 | depends on X86_32 && !UML |
730 | ---help--- | 730 | ---help--- |
731 | This is the driver for the hardware watchdog found on the IEI | 731 | This is the driver for the hardware watchdog found on the IEI |
732 | single board computers EPIC Nano 7240 (and likely others). This | 732 | single board computers EPIC Nano 7240 (and likely others). This |