diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-28 20:56:44 +0100 |
| commit | 2c8917958da115704507aab835c41c1a4a63664d (patch) | |
| tree | e79c26b6347e2ae8444bcdbce1236cc48f63107e /package/busybox/config/util-linux/Config.in | |
| parent | cf5ef7c683fa845a6e6412b319e0a1040aa0f445 (diff) | |
| parent | cd83ced050a5d68c922a0de054ac022cd4ff26ac (diff) | |
resolve conflict
Diffstat (limited to 'package/busybox/config/util-linux/Config.in')
| -rw-r--r-- | package/busybox/config/util-linux/Config.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in index 5462ee98a..8e78e2e27 100644 --- a/package/busybox/config/util-linux/Config.in +++ b/package/busybox/config/util-linux/Config.in @@ -358,7 +358,7 @@ config BUSYBOX_LOSETUP config BUSYBOX_LSPCI bool "lspci" - default y + default n depends on !ADK_PACKAGE_PCIUTILS help lspci is a utility for displaying information about PCI buses in the @@ -368,7 +368,7 @@ config BUSYBOX_LSPCI config BUSYBOX_LSUSB bool "lsusb" - default y + default n depends on !ADK_PACKAGE_LSUSB help lsusb is a utility for displaying information about USB buses in the |