diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/um/Kconfig | 8 | ||||
-rw-r--r-- | arch/um/Kconfig.char (renamed from arch/um/Kconfig_char) | 0 | ||||
-rw-r--r-- | arch/um/Kconfig.i386 (renamed from arch/um/Kconfig_i386) | 0 | ||||
-rw-r--r-- | arch/um/Kconfig.net (renamed from arch/um/Kconfig_net) | 12 | ||||
-rw-r--r-- | arch/um/Kconfig.scsi (renamed from arch/um/Kconfig_scsi) | 0 | ||||
-rw-r--r-- | arch/um/Kconfig.x86_64 (renamed from arch/um/Kconfig_x86_64) | 0 | ||||
-rw-r--r-- | arch/um/Makefile | 8 |
7 files changed, 14 insertions, 14 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index f945444df49c..d5e22f084880 100644 --- a/arch/um/Kconfig +++ b/arch/um/Kconfig | |||
@@ -73,7 +73,7 @@ config MODE_SKAS | |||
73 | to CONFIG_MODE_TT). Otherwise, it is safe to say Y. Disabling this | 73 | to CONFIG_MODE_TT). Otherwise, it is safe to say Y. Disabling this |
74 | option will shrink the UML binary slightly. | 74 | option will shrink the UML binary slightly. |
75 | 75 | ||
76 | source "arch/um/Kconfig_arch" | 76 | source "arch/um/Kconfig.arch" |
77 | source "mm/Kconfig" | 77 | source "mm/Kconfig" |
78 | 78 | ||
79 | config LD_SCRIPT_STATIC | 79 | config LD_SCRIPT_STATIC |
@@ -279,7 +279,7 @@ source "net/Kconfig" | |||
279 | 279 | ||
280 | source "drivers/base/Kconfig" | 280 | source "drivers/base/Kconfig" |
281 | 281 | ||
282 | source "arch/um/Kconfig_char" | 282 | source "arch/um/Kconfig.char" |
283 | 283 | ||
284 | source "drivers/block/Kconfig" | 284 | source "drivers/block/Kconfig" |
285 | 285 | ||
@@ -287,7 +287,7 @@ config NETDEVICES | |||
287 | bool | 287 | bool |
288 | default NET | 288 | default NET |
289 | 289 | ||
290 | source "arch/um/Kconfig_net" | 290 | source "arch/um/Kconfig.net" |
291 | 291 | ||
292 | source "drivers/net/Kconfig" | 292 | source "drivers/net/Kconfig" |
293 | 293 | ||
@@ -311,7 +311,7 @@ config GENERIC_ISA_DMA | |||
311 | depends on SCSI | 311 | depends on SCSI |
312 | default y | 312 | default y |
313 | 313 | ||
314 | source "arch/um/Kconfig_scsi" | 314 | source "arch/um/Kconfig.scsi" |
315 | 315 | ||
316 | endmenu | 316 | endmenu |
317 | 317 | ||
diff --git a/arch/um/Kconfig_char b/arch/um/Kconfig.char index 62d87b71179b..62d87b71179b 100644 --- a/arch/um/Kconfig_char +++ b/arch/um/Kconfig.char | |||
diff --git a/arch/um/Kconfig_i386 b/arch/um/Kconfig.i386 index 8ad156a00499..8ad156a00499 100644 --- a/arch/um/Kconfig_i386 +++ b/arch/um/Kconfig.i386 | |||
diff --git a/arch/um/Kconfig_net b/arch/um/Kconfig.net index fa2ab2dd78b7..14a04ebdeae9 100644 --- a/arch/um/Kconfig_net +++ b/arch/um/Kconfig.net | |||
@@ -34,7 +34,7 @@ config UML_NET_ETHERTAP | |||
34 | link with the host. | 34 | link with the host. |
35 | 35 | ||
36 | To use this, your host kernel must have support for Ethertap | 36 | To use this, your host kernel must have support for Ethertap |
37 | devices. Also, if your host kernel is 2.4.x, it must have | 37 | devices. Also, if your host kernel is 2.4.x, it must have |
38 | CONFIG_NETLINK_DEV configured as Y or M. | 38 | CONFIG_NETLINK_DEV configured as Y or M. |
39 | 39 | ||
40 | For more information, see | 40 | For more information, see |
@@ -43,7 +43,7 @@ config UML_NET_ETHERTAP | |||
43 | networking. | 43 | networking. |
44 | 44 | ||
45 | If you'd like to set up an IP network with the host and/or the | 45 | If you'd like to set up an IP network with the host and/or the |
46 | outside world, say Y to this, the Daemon Transport and/or the | 46 | outside world, say Y to this, the Daemon Transport and/or the |
47 | Slip Transport. You'll need at least one of them, but may choose | 47 | Slip Transport. You'll need at least one of them, but may choose |
48 | more than one without conflict. If you don't need UML networking, | 48 | more than one without conflict. If you don't need UML networking, |
49 | say N. | 49 | say N. |
@@ -78,7 +78,7 @@ config UML_NET_SLIP | |||
78 | 78 | ||
79 | The Ethertap Transport is preferred over slip because of its | 79 | The Ethertap Transport is preferred over slip because of its |
80 | limitations. If you prefer slip, however, say Y here. Otherwise | 80 | limitations. If you prefer slip, however, say Y here. Otherwise |
81 | choose the Multicast transport (to network multiple UMLs on | 81 | choose the Multicast transport (to network multiple UMLs on |
82 | multiple hosts), Ethertap (to network with the host and the | 82 | multiple hosts), Ethertap (to network with the host and the |
83 | outside world), and/or the Daemon transport (to network multiple | 83 | outside world), and/or the Daemon transport (to network multiple |
84 | UMLs on a single host). You may choose more than one without | 84 | UMLs on a single host). You may choose more than one without |
@@ -138,7 +138,7 @@ config UML_NET_PCAP | |||
138 | depends on UML_NET && EXPERIMENTAL | 138 | depends on UML_NET && EXPERIMENTAL |
139 | help | 139 | help |
140 | The pcap transport makes a pcap packet stream on the host look | 140 | The pcap transport makes a pcap packet stream on the host look |
141 | like an ethernet device inside UML. This is useful for making | 141 | like an ethernet device inside UML. This is useful for making |
142 | UML act as a network monitor for the host. You must have libcap | 142 | UML act as a network monitor for the host. You must have libcap |
143 | installed in order to build the pcap transport into UML. | 143 | installed in order to build the pcap transport into UML. |
144 | 144 | ||
@@ -169,11 +169,11 @@ config UML_NET_SLIRP | |||
169 | setup string. The effect of this transport on the UML is similar | 169 | setup string. The effect of this transport on the UML is similar |
170 | that of a host behind a firewall that masquerades all network | 170 | that of a host behind a firewall that masquerades all network |
171 | connections passing through it (but is less secure). | 171 | connections passing through it (but is less secure). |
172 | 172 | ||
173 | To use this you should first have slirp compiled somewhere | 173 | To use this you should first have slirp compiled somewhere |
174 | accessible on the host, and have read its documentation. If you | 174 | accessible on the host, and have read its documentation. If you |
175 | don't need UML networking, say N. | 175 | don't need UML networking, say N. |
176 | 176 | ||
177 | Startup example: "eth0=slirp,FE:FD:01:02:03:04,/usr/local/bin/slirp" | 177 | Startup example: "eth0=slirp,FE:FD:01:02:03:04,/usr/local/bin/slirp" |
178 | 178 | ||
179 | endmenu | 179 | endmenu |
diff --git a/arch/um/Kconfig_scsi b/arch/um/Kconfig.scsi index c291c942b1a8..c291c942b1a8 100644 --- a/arch/um/Kconfig_scsi +++ b/arch/um/Kconfig.scsi | |||
diff --git a/arch/um/Kconfig_x86_64 b/arch/um/Kconfig.x86_64 index 6e5357c5bcfb..6e5357c5bcfb 100644 --- a/arch/um/Kconfig_x86_64 +++ b/arch/um/Kconfig.x86_64 | |||
diff --git a/arch/um/Makefile b/arch/um/Makefile index f5a83a72aa75..15ec6b86054b 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile | |||
@@ -101,10 +101,10 @@ define archhelp | |||
101 | endef | 101 | endef |
102 | 102 | ||
103 | ifneq ($(KBUILD_SRC),) | 103 | ifneq ($(KBUILD_SRC),) |
104 | $(shell mkdir -p $(ARCH_DIR) && ln -fsn $(srctree)/$(ARCH_DIR)/Kconfig_$(SUBARCH) $(ARCH_DIR)/Kconfig_arch) | 104 | $(shell mkdir -p $(ARCH_DIR) && ln -fsn $(srctree)/$(ARCH_DIR)/Kconfig.$(SUBARCH) $(ARCH_DIR)/Kconfig.arch) |
105 | CLEAN_FILES += $(ARCH_DIR)/Kconfig_arch | 105 | CLEAN_FILES += $(ARCH_DIR)/Kconfig.arch |
106 | else | 106 | else |
107 | $(shell cd $(ARCH_DIR) && ln -sf Kconfig_$(SUBARCH) Kconfig_arch) | 107 | $(shell cd $(ARCH_DIR) && ln -sf Kconfig.$(SUBARCH) Kconfig.arch) |
108 | endif | 108 | endif |
109 | 109 | ||
110 | prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS) | 110 | 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 | 147 | ||
148 | MRPROPER_FILES += $(SYMLINK_HEADERS) $(ARCH_SYMLINKS) \ | 148 | MRPROPER_FILES += $(SYMLINK_HEADERS) $(ARCH_SYMLINKS) \ |
149 | $(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS)) $(ARCH_DIR)/os \ | 149 | $(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS)) $(ARCH_DIR)/os \ |
150 | $(ARCH_DIR)/Kconfig_arch | 150 | $(ARCH_DIR)/Kconfig.arch |
151 | 151 | ||
152 | archclean: | 152 | archclean: |
153 | $(Q)$(MAKE) $(clean)=$(ARCH_DIR)/util | 153 | $(Q)$(MAKE) $(clean)=$(ARCH_DIR)/util |