From 08b178ebf37bbfb78329e0ae6ea688b103d205bf Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Sat, 3 Sep 2005 15:57:12 -0700 Subject: [PATCH] [PATCH] uml: Rename Kconfig files to be like the other arches To the extent that sub-Kconfig files exist elsewhere in the tree, they are named Kconfig.foo, rather than the Kconfig_foo that UML has. This patch brings the names in line with the rest of the tree. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/um/Kconfig | 8 ++++---- arch/um/{Kconfig_char => Kconfig.char} | 0 arch/um/{Kconfig_i386 => Kconfig.i386} | 0 arch/um/{Kconfig_net => Kconfig.net} | 12 ++++++------ arch/um/{Kconfig_scsi => Kconfig.scsi} | 0 arch/um/{Kconfig_x86_64 => Kconfig.x86_64} | 0 arch/um/Makefile | 8 ++++---- 7 files changed, 14 insertions(+), 14 deletions(-) rename arch/um/{Kconfig_char => Kconfig.char} (100%) rename arch/um/{Kconfig_i386 => Kconfig.i386} (100%) rename arch/um/{Kconfig_net => Kconfig.net} (98%) rename arch/um/{Kconfig_scsi => Kconfig.scsi} (100%) rename arch/um/{Kconfig_x86_64 => Kconfig.x86_64} (100%) diff --git a/arch/um/Kconfig b/arch/um/Kconfig index f945444..d5e22f0 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -73,7 +73,7 @@ config MODE_SKAS to CONFIG_MODE_TT). Otherwise, it is safe to say Y. Disabling this option will shrink the UML binary slightly. -source "arch/um/Kconfig_arch" +source "arch/um/Kconfig.arch" source "mm/Kconfig" config LD_SCRIPT_STATIC @@ -279,7 +279,7 @@ source "net/Kconfig" source "drivers/base/Kconfig" -source "arch/um/Kconfig_char" +source "arch/um/Kconfig.char" source "drivers/block/Kconfig" @@ -287,7 +287,7 @@ config NETDEVICES bool default NET -source "arch/um/Kconfig_net" +source "arch/um/Kconfig.net" source "drivers/net/Kconfig" @@ -311,7 +311,7 @@ config GENERIC_ISA_DMA depends on SCSI default y -source "arch/um/Kconfig_scsi" +source "arch/um/Kconfig.scsi" endmenu diff --git a/arch/um/Kconfig_char b/arch/um/Kconfig.char similarity index 100% rename from arch/um/Kconfig_char rename to arch/um/Kconfig.char diff --git a/arch/um/Kconfig_i386 b/arch/um/Kconfig.i386 similarity index 100% rename from arch/um/Kconfig_i386 rename to arch/um/Kconfig.i386 diff --git a/arch/um/Kconfig_net b/arch/um/Kconfig.net similarity index 98% rename from arch/um/Kconfig_net rename to arch/um/Kconfig.net index fa2ab2d..14a04eb 100644 --- a/arch/um/Kconfig_net +++ b/arch/um/Kconfig.net @@ -34,7 +34,7 @@ config UML_NET_ETHERTAP link with the host. To use this, your host kernel must have support for Ethertap - devices. Also, if your host kernel is 2.4.x, it must have + devices. Also, if your host kernel is 2.4.x, it must have CONFIG_NETLINK_DEV configured as Y or M. For more information, see @@ -43,7 +43,7 @@ config UML_NET_ETHERTAP networking. If you'd like to set up an IP network with the host and/or the - outside world, say Y to this, the Daemon Transport and/or the + outside world, say Y to this, the Daemon Transport and/or the Slip Transport. You'll need at least one of them, but may choose more than one without conflict. If you don't need UML networking, say N. @@ -78,7 +78,7 @@ config UML_NET_SLIP The Ethertap Transport is preferred over slip because of its limitations. If you prefer slip, however, say Y here. Otherwise - choose the Multicast transport (to network multiple UMLs on + choose the Multicast transport (to network multiple UMLs on multiple hosts), Ethertap (to network with the host and the outside world), and/or the Daemon transport (to network multiple UMLs on a single host). You may choose more than one without @@ -138,7 +138,7 @@ config UML_NET_PCAP depends on UML_NET && EXPERIMENTAL help The pcap transport makes a pcap packet stream on the host look - like an ethernet device inside UML. This is useful for making + like an ethernet device inside UML. This is useful for making UML act as a network monitor for the host. You must have libcap installed in order to build the pcap transport into UML. @@ -169,11 +169,11 @@ config UML_NET_SLIRP setup string. The effect of this transport on the UML is similar that of a host behind a firewall that masquerades all network connections passing through it (but is less secure). - + To use this you should first have slirp compiled somewhere accessible on the host, and have read its documentation. If you don't need UML networking, say N. - + Startup example: "eth0=slirp,FE:FD:01:02:03:04,/usr/local/bin/slirp" endmenu diff --git a/arch/um/Kconfig_scsi b/arch/um/Kconfig.scsi similarity index 100% rename from arch/um/Kconfig_scsi rename to arch/um/Kconfig.scsi diff --git a/arch/um/Kconfig_x86_64 b/arch/um/Kconfig.x86_64 similarity index 100% rename from arch/um/Kconfig_x86_64 rename to arch/um/Kconfig.x86_64 diff --git a/arch/um/Makefile b/arch/um/Makefile index f5a83a7..15ec6b8 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -101,10 +101,10 @@ define archhelp endef ifneq ($(KBUILD_SRC),) -$(shell mkdir -p $(ARCH_DIR) && ln -fsn $(srctree)/$(ARCH_DIR)/Kconfig_$(SUBARCH) $(ARCH_DIR)/Kconfig_arch) -CLEAN_FILES += $(ARCH_DIR)/Kconfig_arch +$(shell mkdir -p $(ARCH_DIR) && ln -fsn $(srctree)/$(ARCH_DIR)/Kconfig.$(SUBARCH) $(ARCH_DIR)/Kconfig.arch) +CLEAN_FILES += $(ARCH_DIR)/Kconfig.arch else -$(shell cd $(ARCH_DIR) && ln -sf Kconfig_$(SUBARCH) Kconfig_arch) +$(shell cd $(ARCH_DIR) && ln -sf Kconfig.$(SUBARCH) Kconfig.arch) endif prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS) @@ -147,7 +147,7 @@ CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/include/uml-config.h \ MRPROPER_FILES += $(SYMLINK_HEADERS) $(ARCH_SYMLINKS) \ $(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS)) $(ARCH_DIR)/os \ - $(ARCH_DIR)/Kconfig_arch + $(ARCH_DIR)/Kconfig.arch archclean: $(Q)$(MAKE) $(clean)=$(ARCH_DIR)/util -- 2.7.4