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

Commit 3369465e authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: switch to use of drivers/Kconfig

parent c039aff6
Loading
Loading
Loading
Loading
+1 −22
Original line number Diff line number Diff line
@@ -2,20 +2,14 @@ source "init/Kconfig"

source "kernel/Kconfig.freezer"

source "drivers/block/Kconfig"

source "arch/um/Kconfig.char"

source "drivers/base/Kconfig"
source "drivers/Kconfig"

source "net/Kconfig"

source "arch/um/Kconfig.net"

source "drivers/net/Kconfig"

source "drivers/connector/Kconfig"

source "fs/Kconfig"

source "security/Kconfig"
@@ -24,19 +18,4 @@ source "crypto/Kconfig"

source "lib/Kconfig"

source "drivers/scsi/Kconfig"

source "drivers/md/Kconfig"

if BROKEN
	source "drivers/mtd/Kconfig"
endif

source "drivers/leds/Kconfig"

#This is just to shut up some Kconfig warnings, so no prompt.
config INPUT
	tristate
	default n

source "arch/um/Kconfig.debug"
+3 −3
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ if RTC_LIB=n
config RTC
	tristate "Enhanced Real Time Clock Support (legacy PC RTC driver)"
	depends on !PPC && !PARISC && !IA64 && !M68K && !SPARC && !FRV \
			&& !ARM && !SUPERH && !S390 && !AVR32 && !BLACKFIN
			&& !ARM && !SUPERH && !S390 && !AVR32 && !BLACKFIN && !UML
	---help---
	  If you say Y here and create a character special file /dev/rtc with
	  major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -346,7 +346,7 @@ config JS_RTC

config GEN_RTC
	tristate "Generic /dev/rtc emulation"
	depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH && !AVR32 && !BLACKFIN
	depends on RTC!=y && !IA64 && !ARM && !M32R && !MIPS && !SPARC && !FRV && !S390 && !SUPERH && !AVR32 && !BLACKFIN && !UML
	---help---
	  If you say Y here and create a character special file /dev/rtc with
	  major number 10 and minor number 135 using mknod ("man mknod"), you
@@ -490,7 +490,7 @@ config SCx200_GPIO

config PC8736x_GPIO
	tristate "NatSemi PC8736x GPIO Support"
	depends on X86_32
	depends on X86_32 && !UML
	default SCx200_GPIO	# mostly N
	select NSC_GPIO		# needed for support routines
	help
+1 −1
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ static const struct tty_operations ttyprintk_ops = {
	.ioctl = tpk_ioctl,
};

struct tty_port_operations null_ops = { };
static struct tty_port_operations null_ops = { };

static struct tty_driver *ttyprintk_driver;

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@
#

menu "Input device support"
	depends on !S390
	depends on !S390 && !UML

config INPUT
	tristate "Generic input layer (needed for keyboard, mouse, ...)" if EXPERT
+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@
menuconfig ISDN
	bool "ISDN support"
	depends on NET
	depends on !S390
	depends on !S390 && !UML
	---help---
	  ISDN ("Integrated Services Digital Network", called RNIS in France)
	  is a fully digital telephone service that can be used for voice and
Loading