[SENT at 2003-02-10]
[MERGED]

  Hello,

  the following patch (against 2.5.59-1um) aims to clean up the kconfig UML
specification a little. It removes some duplicate entries and {moves,changes
order} of few others so that they match the usual look and order of the menu
for other architectures.

  I believe there should be hopefully no grave problems with this patch. Please
consider applying.

 arch/um/Kconfig     |   32 ++++++++++++-----------
 arch/um/Kconfig_net |   70 ----------------------------------------------------
 2 files changed, 18 insertions(+), 84 deletions(-)

  Kind regards,
				Petr Baudis

diff -ruN -x *.cmd linux/arch/um/Kconfig linux+pasky/arch/um/Kconfig
--- linux/arch/um/Kconfig	Fri Feb  7 13:18:53 2003
+++ linux+pasky/arch/um/Kconfig	Mon Feb 10 13:42:22 2003
@@ -30,6 +30,8 @@
 	bool
 	default y
 
+source "init/Kconfig"
+
 menu "UML-specific options"
 
 config MODE_TT
@@ -63,18 +65,6 @@
 	to CONFIG_MODE_TT).  Otherwise, it is safe to say Y.  Disabling this
 	option will shrink the UML binary slightly.
 
-config NET
-	bool "Networking support"
-
-config BINFMT_AOUT
-	tristate "Kernel support for a.out binaries"
-
-config BINFMT_ELF
-	tristate "Kernel support for ELF binaries"
-
-config BINFMT_MISC
-	tristate "Kernel support for MISC binaries"
-
 config HOSTFS
 	tristate "Host filesystem"
 	help
@@ -183,7 +173,18 @@
 
 endmenu
 
-source "init/Kconfig"
+menu "Executable file formats"
+
+config BINFMT_AOUT
+	tristate "Kernel support for a.out binaries"
+
+config BINFMT_ELF
+	tristate "Kernel support for ELF binaries"
+
+config BINFMT_MISC
+	tristate "Kernel support for MISC binaries"
+
+endmenu
 
 source "arch/um/Kconfig_char"
 
@@ -193,9 +194,10 @@
 	bool
 	default NET
 
-source "arch/um/Kconfig_net"
-
 source "net/Kconfig"
+
+# TODO: Ideally this should be inside of "Network options".
+source "arch/um/Kconfig_net"
 
 source "fs/Kconfig"
 
diff -ruN -x *.cmd linux/arch/um/Kconfig_net linux+pasky/arch/um/Kconfig_net
--- linux/arch/um/Kconfig_net	Tue Feb  4 15:38:57 2003
+++ linux+pasky/arch/um/Kconfig_net	Mon Feb 10 12:53:51 2003
@@ -1,5 +1,5 @@
 
-menu "Network Devices"
+menu "UML Network Devices"
 	depends on NET
 
 # UML virtual driver
@@ -175,74 +175,6 @@
         don't need UML networking, say N.
 	
         Startup example: "eth0=slirp,FE:FD:01:02:03:04,/usr/local/bin/slirp"
-
-
-# Below are hardware-independent drivers mirrored from
-# drivers/net/Config.in. It would be nice if Linux
-# had HW independent drivers separated from the other
-# but it does not. Until then each non-ISA/PCI arch
-# needs to provide it's own menu of network drivers
-config DUMMY
-	tristate "Dummy net driver support"
-
-config BONDING
-	tristate "Bonding driver support"
-
-config EQUALIZER
-	tristate "EQL (serial line load balancing) support"
-
-config TUN
-	tristate "Universal TUN/TAP device driver support"
-
-config ETHERTAP
-	tristate "Ethertap network tap (OBSOLETE)"
-	depends on EXPERIMENTAL && NETLINK
-
-config PPP
-	tristate "PPP (point-to-point protocol) support"
-
-config PPP_MULTILINK
-	bool "PPP multilink support (EXPERIMENTAL)"
-	depends on PPP && EXPERIMENTAL
-
-config PPP_FILTER
-	bool "PPP filtering"
-	depends on PPP && FILTER
-
-config PPP_ASYNC
-	tristate "PPP support for async serial ports"
-	depends on PPP
-
-config PPP_SYNC_TTY
-	tristate "PPP support for sync tty ports"
-	depends on PPP
-
-config PPP_DEFLATE
-	tristate "PPP Deflate compression"
-	depends on PPP
-
-config PPP_BSDCOMP
-	tristate "PPP BSD-Compress compression"
-	depends on PPP
-
-config PPPOE
-	tristate "PPP over Ethernet (EXPERIMENTAL)"
-	depends on PPP && EXPERIMENTAL
-
-config SLIP
-	tristate "SLIP (serial line) support"
-
-config SLIP_COMPRESSED
-	bool "CSLIP compressed headers"
-	depends on SLIP=y
-
-config SLIP_SMART
-	bool "Keepalive and linefill"
-	depends on SLIP=y
-
-config SLIP_MODE_SLIP6
-	bool "Six bit SLIP encapsulation"
-	depends on SLIP=y
 
 endmenu