diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 12:56:34 +1000 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 12:56:34 +1000 |
| commit | c31744ca1a86b2276c37c6d9a884660185debed6 (patch) | |
| tree | bb051c35c3430a3793ceef173a01cb522fb4ae05 /init | |
| parent | 1a286d510c2125bdab601ce47afd4d27b6ce6f41 (diff) | |
| parent | e329089c62ed813e97344f8c61d7dc34221fd5ee (diff) | |
| download | busybox-w32-c31744ca1a86b2276c37c6d9a884660185debed6.tar.gz busybox-w32-c31744ca1a86b2276c37c6d9a884660185debed6.tar.bz2 busybox-w32-c31744ca1a86b2276c37c6d9a884660185debed6.zip | |
Merge branch 'origin/master' (early part)
Diffstat (limited to 'init')
| -rw-r--r-- | init/Config.src | 2 | ||||
| -rw-r--r-- | init/Kbuild.src | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/init/Config.src b/init/Config.src index e8121c96a..2e9208150 100644 --- a/init/Config.src +++ b/init/Config.src | |||
| @@ -5,6 +5,8 @@ | |||
| 5 | 5 | ||
| 6 | menu "Init Utilities" | 6 | menu "Init Utilities" |
| 7 | 7 | ||
| 8 | INSERT | ||
| 9 | |||
| 8 | config INIT | 10 | config INIT |
| 9 | bool "init" | 11 | bool "init" |
| 10 | default y | 12 | default y |
diff --git a/init/Kbuild.src b/init/Kbuild.src index ce3f30256..6095a78bb 100644 --- a/init/Kbuild.src +++ b/init/Kbuild.src | |||
| @@ -5,6 +5,8 @@ | |||
| 5 | # Licensed under the GPL v2, see the file LICENSE in this tarball. | 5 | # Licensed under the GPL v2, see the file LICENSE in this tarball. |
| 6 | 6 | ||
| 7 | lib-y:= | 7 | lib-y:= |
| 8 | |||
| 9 | INSERT | ||
| 8 | lib-$(CONFIG_HALT) += halt.o | 10 | lib-$(CONFIG_HALT) += halt.o |
| 9 | lib-$(CONFIG_INIT) += init.o | 11 | lib-$(CONFIG_INIT) += init.o |
| 10 | lib-$(CONFIG_MESG) += mesg.o | 12 | lib-$(CONFIG_MESG) += mesg.o |