diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-16 20:45:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-10-16 20:45:02 +0200 |
| commit | efdbbf3f3ac4651bc612e6ce5139b21a913de5f9 (patch) | |
| tree | a4b56cf133b395d53d4b0c4e1d68f807da74e20e | |
| parent | 42115209359cb9a714e50da7543776ebca484adb (diff) | |
| parent | 8f358a703e8aec9e4c6e2d8e719c053e6da7fdce (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | package/busybox/config/archival/Config.in | 2 | ||||
| -rw-r--r-- | package/busybox/config/networking/Config.in | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 9 |
3 files changed, 8 insertions, 5 deletions
diff --git a/package/busybox/config/archival/Config.in b/package/busybox/config/archival/Config.in index 33ba719ca..aac6578f3 100644 --- a/package/busybox/config/archival/Config.in +++ b/package/busybox/config/archival/Config.in @@ -107,7 +107,7 @@ config BUSYBOX_BZIP2 config BUSYBOX_CPIO bool "cpio" depends on !ADK_PACKAGE_CPIO - default y + default n help cpio is an archival utility program used to create, modify, and extract contents from archives. diff --git a/package/busybox/config/networking/Config.in b/package/busybox/config/networking/Config.in index b9211f4fa..f00b23ee9 100644 --- a/package/busybox/config/networking/Config.in +++ b/package/busybox/config/networking/Config.in @@ -63,7 +63,7 @@ config BUSYBOX_ARPING config BUSYBOX_BRCTL bool "brctl" depends on !ADK_PACKAGE_BRIDGE_UTILS - default y + default n depends on BUSYBOX_PLATFORM_LINUX help Manage ethernet bridges. diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index 7ab296aae..871c222c3 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -289,12 +289,13 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_SR Y or M to "ISO 9660 CD-ROM file system support" later. config ADK_KERNEL_BLK_DEV_MD + prompt "md support........................ RAID support (kernel)" tristate select ADK_KERNEL_MD default n config ADK_KPACKAGE_KMOD_BLK_DEV_MD - prompt "kmod-blk-dev-md................... RAID support" + prompt "kmod-blk-dev-md................... RAID support (module)" tristate depends on !ADK_KERNEL_BLK_DEV_MD select ADK_KERNEL_MD @@ -302,23 +303,25 @@ config ADK_KPACKAGE_KMOD_BLK_DEV_MD help config ADK_KERNEL_MD_RAID0 + prompt "raid0 support.................... RAID0 support (kernel)" tristate depends on ADK_KERNEL_BLK_DEV_MD help config ADK_KPACKAGE_KMOD_MD_RAID0 - prompt "kmod-md-raid0..................... RAID0 support" + prompt "kmod-md-raid0..................... RAID0 support (module)" tristate depends on ADK_KPACKAGE_KMOD_BLK_DEV_MD help config ADK_KERNEL_MD_RAID1 + prompt "raid1 support.................... RAID1 support (kernel)" tristate depends on ADK_KERNEL_BLK_DEV_MD help config ADK_KPACKAGE_KMOD_MD_RAID1 - prompt "kmod-md-raid1..................... RAID1 support" + prompt "kmod-md-raid1..................... RAID1 support (module)" tristate depends on ADK_KPACKAGE_KMOD_BLK_DEV_MD help |