diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 11:03:58 +0100 |
| commit | 94c763109f74b446e4d5d31e55ef337c8c8d86cb (patch) | |
| tree | 22d1cd06809f5a5c11241e998d9ead4010ac3c91 /target/linux | |
| parent | a217fc80b29080dae963bb15051df023de36ce39 (diff) | |
| parent | 16d94117a716fc361d3db9a2a17cf4c45eab837d (diff) | |
resolve conflicts
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/config/Config.in.block | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.input | 7 | ||||
| -rw-r--r-- | target/linux/config/Config.in.netdevice | 8 |
3 files changed, 13 insertions, 4 deletions
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index f13772f53..1019477c1 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -120,6 +120,8 @@ config ADK_KERNEL_ATA_PIIX select ADK_KERNEL_ATA_BMDMA select ADK_KERNEL_BLK_DEV select ADK_KERNEL_BLK_DEV_SD + default y if ADK_TARGET_SYSTEM_QEMU_MIPS64 + default y if ADK_TARGET_SYSTEM_QEMU_MIPS64EL default y if ADK_TARGET_SYSTEM_QEMU_MIPS default y if ADK_TARGET_SYSTEM_QEMU_MIPSEL default y if ADK_TARGET_SYSTEM_QEMU_X86 diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 2241c0ed7..754cf7340 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -22,6 +22,13 @@ config ADK_KERNEL_KEYBOARD_ATKBD default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n +config ADK_KERNEL_INPUT_MOUSE + boolean + default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C + default y if ADK_TARGET_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 + default n + config ADK_KERNEL_INPUT_MOUSEDEV boolean default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C diff --git a/target/linux/config/Config.in.netdevice b/target/linux/config/Config.in.netdevice index e7ff2be99..ef12cbe0c 100644 --- a/target/linux/config/Config.in.netdevice +++ b/target/linux/config/Config.in.netdevice @@ -240,10 +240,10 @@ config ADK_KERNEL_RT2X00 select ADK_KPACKAGE_KMOD_FW_LOADER select ADK_KPACKAGE_KMOD_EEPROM_93CX6 -config ADK_MOD_KERNEL_CFG80211 +config ADK_KERNEL_MOD_CFG80211 tristate -config ADK_MOD_KERNEL_LIB80211 +config ADK_KERNEL_MOD_LIB80211 tristate config ADK_KERNEL_CFG80211_WEXT @@ -269,8 +269,8 @@ config ADK_KPACKAGE_KMOD_MAC80211 tristate select ADK_KERNEL_WIRELESS select ADK_KERNEL_WLAN_80211 - select ADK_MOD_KERNEL_CFG80211 - select ADK_MOD_KERNEL_LIB80211 + select ADK_KERNEL_MOD_CFG80211 + select ADK_KERNEL_MOD_LIB80211 select ADK_KPACKAGE_KMOD_CRYPTO_AES select ADK_KPACKAGE_KMOD_CRYPTO_ECB select ADK_KPACKAGE_KMOD_CRYPTO_ARC4 |