diff options
| author | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2012-03-21 20:53:50 +0000 |
| commit | f6bad5ef766b0447158e3de2f55c35f1f6cecb58 (patch) | |
| tree | f5ec7ac45234c25794c97f87e9a6daa8a551e57c /util-linux/Config.src | |
| parent | 72394258b6509b40e0fa08594ac86215a558dfd8 (diff) | |
| parent | 8d0e0cdadf726beab28ccdc7d69738c1534e1f74 (diff) | |
| download | busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.gz busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.tar.bz2 busybox-w32-f6bad5ef766b0447158e3de2f55c35f1f6cecb58.zip | |
Merge commit '8d0e0cdadf726beab28ccdc7d69738c1534e1f74' into merge
Conflicts:
include/platform.h
libbb/Kbuild.src
libbb/messages.c
Diffstat (limited to 'util-linux/Config.src')
| -rw-r--r-- | util-linux/Config.src | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/util-linux/Config.src b/util-linux/Config.src index dbf2b0d85..941a47f90 100644 --- a/util-linux/Config.src +++ b/util-linux/Config.src | |||
| @@ -361,7 +361,6 @@ config FEATURE_HWCLOCK_ADJTIME_FHS | |||
| 361 | config IPCRM | 361 | config IPCRM |
| 362 | bool "ipcrm" | 362 | bool "ipcrm" |
| 363 | default y | 363 | default y |
| 364 | select FEATURE_SUID | ||
| 365 | help | 364 | help |
| 366 | The ipcrm utility allows the removal of System V interprocess | 365 | The ipcrm utility allows the removal of System V interprocess |
| 367 | communication (IPC) objects and the associated data structures | 366 | communication (IPC) objects and the associated data structures |
| @@ -371,7 +370,6 @@ config IPCS | |||
| 371 | bool "ipcs" | 370 | bool "ipcs" |
| 372 | default y | 371 | default y |
| 373 | depends on PLATFORM_LINUX | 372 | depends on PLATFORM_LINUX |
| 374 | select FEATURE_SUID | ||
| 375 | help | 373 | help |
| 376 | The ipcs utility is used to provide information on the currently | 374 | The ipcs utility is used to provide information on the currently |
| 377 | allocated System V interprocess (IPC) objects in the system. | 375 | allocated System V interprocess (IPC) objects in the system. |