diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-01 13:26:42 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-01 13:26:42 +0200 |
| commit | 32d4f19aa5f05255c3d609048e1bf6ac4ffbfef4 (patch) | |
| tree | a92c3310cd85ac00ed20e1ecac5dc4fdc5243fda /target | |
| parent | 38e356a749191c1832c9726b0b6cb913737af700 (diff) | |
| parent | a3e0d02b1c8b618fdfc0454560f75e678e0d68c0 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target')
| -rw-r--r-- | target/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.misc | 3 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 6 | ||||
| -rw-r--r-- | target/linux/config/Config.in.usb | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/target/Makefile b/target/Makefile index bffcabfe0..7ca524c89 100644 --- a/target/Makefile +++ b/target/Makefile @@ -65,7 +65,7 @@ ifneq ($(ADK_TARGET_CMDLINE),) @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${ADK_TARGET_CMDLINE}"#' \ ${BUILD_DIR}/.kernelconfig.board endif -ifneq ($(ADK_PACKAGE_CMDLINE),) +ifneq ($(ADK_PACKAGE_CRYPTINIT_ROOT),) @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${ADK_PACKAGE_CMDLINE}"#' \ ${BUILD_DIR}/.kernelconfig.board endif diff --git a/target/linux/config/Config.in.misc b/target/linux/config/Config.in.misc index b910eeec5..a351fa59b 100644 --- a/target/linux/config/Config.in.misc +++ b/target/linux/config/Config.in.misc @@ -1,6 +1,3 @@ -config ADK_KERNEL_RFKILL - boolean - config ADK_KERNEL_I2C boolean diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index a6251a71d..14820b810 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -249,10 +249,14 @@ config ADK_KERNEL_WIRELESS config ADK_KERNEL_WIRELESS_EXT boolean +config ADK_KPACKAGE_KMOD_RFKILL + tristate + config ADK_KERNEL_MAC80211_LEDS boolean select ADK_KPACKAGE_KMOD_LEDS_CLASS select ADK_KERNEL_NEW_LEDS + select ADK_KERNEL_LEDS_TRIGGERS config ADK_KERNEL_WLAN_80211 boolean @@ -293,7 +297,6 @@ config ADK_KERNEL_MAC80211_DEBUGFS config ADK_KPACKAGE_KMOD_MAC80211 tristate - select ADK_KERNEL_RFKILL select ADK_KERNEL_WIRELESS select ADK_KERNEL_WLAN_80211 select ADK_KERNEL_MOD_CFG80211 @@ -301,6 +304,7 @@ config ADK_KPACKAGE_KMOD_MAC80211 select ADK_KPACKAGE_KMOD_CRYPTO_AES select ADK_KPACKAGE_KMOD_CRYPTO_ECB select ADK_KPACKAGE_KMOD_CRYPTO_ARC4 + select ADK_KPACKAGE_KMOD_RFKILL config ADK_DEBUG_MAC80211 boolean diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 6d1108953..2bc8d73db 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -200,7 +200,7 @@ config ADK_KPACKAGE_KMOD_USB_PEGASUS config ADK_KPACKAGE_KMOD_USB_HSO prompt "kmod-usb-hso...................... Support for USB HSO devices" tristate - select ADK_KERNEL_RFKILL + select ADK_KPACKAGE_KMOD_RFKILL select ADK_KPACKAGE_KMOD_USB_STORAGE default n depends on ADK_PACKAGE_KMOD_USB_CONTROLLER |