Commit 08b178eb authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

[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: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 96e59245
...@@ -73,7 +73,7 @@ config MODE_SKAS ...@@ -73,7 +73,7 @@ config MODE_SKAS
to CONFIG_MODE_TT). Otherwise, it is safe to say Y. Disabling this to CONFIG_MODE_TT). Otherwise, it is safe to say Y. Disabling this
option will shrink the UML binary slightly. option will shrink the UML binary slightly.
source "arch/um/Kconfig_arch" source "arch/um/Kconfig.arch"
source "mm/Kconfig" source "mm/Kconfig"
config LD_SCRIPT_STATIC config LD_SCRIPT_STATIC
...@@ -279,7 +279,7 @@ source "net/Kconfig" ...@@ -279,7 +279,7 @@ source "net/Kconfig"
source "drivers/base/Kconfig" source "drivers/base/Kconfig"
source "arch/um/Kconfig_char" source "arch/um/Kconfig.char"
source "drivers/block/Kconfig" source "drivers/block/Kconfig"
...@@ -287,7 +287,7 @@ config NETDEVICES ...@@ -287,7 +287,7 @@ config NETDEVICES
bool bool
default NET default NET
source "arch/um/Kconfig_net" source "arch/um/Kconfig.net"
source "drivers/net/Kconfig" source "drivers/net/Kconfig"
...@@ -311,7 +311,7 @@ config GENERIC_ISA_DMA ...@@ -311,7 +311,7 @@ config GENERIC_ISA_DMA
depends on SCSI depends on SCSI
default y default y
source "arch/um/Kconfig_scsi" source "arch/um/Kconfig.scsi"
endmenu endmenu
......
...@@ -101,10 +101,10 @@ define archhelp ...@@ -101,10 +101,10 @@ define archhelp
endef endef
ifneq ($(KBUILD_SRC),) ifneq ($(KBUILD_SRC),)
$(shell mkdir -p $(ARCH_DIR) && ln -fsn $(srctree)/$(ARCH_DIR)/Kconfig_$(SUBARCH) $(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 CLEAN_FILES += $(ARCH_DIR)/Kconfig.arch
else else
$(shell cd $(ARCH_DIR) && ln -sf Kconfig_$(SUBARCH) Kconfig_arch) $(shell cd $(ARCH_DIR) && ln -sf Kconfig.$(SUBARCH) Kconfig.arch)
endif endif
prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS) prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS)
...@@ -147,7 +147,7 @@ CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/include/uml-config.h \ ...@@ -147,7 +147,7 @@ CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/include/uml-config.h \
MRPROPER_FILES += $(SYMLINK_HEADERS) $(ARCH_SYMLINKS) \ MRPROPER_FILES += $(SYMLINK_HEADERS) $(ARCH_SYMLINKS) \
$(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS)) $(ARCH_DIR)/os \ $(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS)) $(ARCH_DIR)/os \
$(ARCH_DIR)/Kconfig_arch $(ARCH_DIR)/Kconfig.arch
archclean: archclean:
$(Q)$(MAKE) $(clean)=$(ARCH_DIR)/util $(Q)$(MAKE) $(clean)=$(ARCH_DIR)/util
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment