diff options
author | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2012-03-23 11:13:23 +0000 |
commit | 40514a0309939f2446f0d4ed9600cad5de396e7f (patch) | |
tree | 0f5f4a57d4bb7893418b5bb11d482858eb17ba8b /coreutils/Config.src | |
parent | 9db164d6e39050d09f38288c6045cd2a2cbf6d63 (diff) | |
parent | c0cae52662ccced9df19f19ec94238d1b1e3bd71 (diff) | |
download | busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.gz busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.tar.bz2 busybox-w32-40514a0309939f2446f0d4ed9600cad5de396e7f.zip |
Merge commit 'c0cae52662ccced9df19f19ec94238d1b1e3bd71' into merge
Conflicts:
Makefile.flags
scripts/basic/fixdep.c
Diffstat (limited to 'coreutils/Config.src')
-rw-r--r-- | coreutils/Config.src | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/coreutils/Config.src b/coreutils/Config.src index cff2ce216..81be71993 100644 --- a/coreutils/Config.src +++ b/coreutils/Config.src | |||
@@ -269,13 +269,6 @@ config FEATURE_FANCY_HEAD | |||
269 | help | 269 | help |
270 | This enables the head options (-c, -q, and -v). | 270 | This enables the head options (-c, -q, and -v). |
271 | 271 | ||
272 | config HOSTID | ||
273 | bool "hostid" | ||
274 | default y | ||
275 | help | ||
276 | hostid prints the numeric identifier (in hexadecimal) for | ||
277 | the current host. | ||
278 | |||
279 | config INSTALL | 272 | config INSTALL |
280 | bool "install" | 273 | bool "install" |
281 | default y | 274 | default y |