diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-05 11:53:26 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-05 11:53:26 +0200 |
commit | 4a54d9dd804bc3b64703ba04060ec8c48a8c9811 (patch) | |
tree | 948f1b2bead3d128603ad5a34609205db61da3aa /target/linux/config/Config.in.input | |
parent | e61aad237ecb819635bb7550dbbf66f2b8817b50 (diff) | |
parent | 40c2b2f6a83e9cca14567e855fc75a8d1ef78f28 (diff) |
resolve conflict
Diffstat (limited to 'target/linux/config/Config.in.input')
-rw-r--r-- | target/linux/config/Config.in.input | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index b8566e569..65524a0d3 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -6,6 +6,8 @@ config ADK_KERNEL_INPUT default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n @@ -15,6 +17,8 @@ config ADK_KERNEL_INPUT_KEYBOARD default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n @@ -24,6 +28,8 @@ config ADK_KERNEL_KEYBOARD_ATKBD default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n @@ -33,6 +39,8 @@ config ADK_KERNEL_INPUT_MOUSE default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n @@ -42,6 +50,8 @@ config ADK_KERNEL_INPUT_MOUSEDEV default y if ADK_TARGET_SYSTEM_PCENGINES_ALIX1C default y if ADK_TARGET_SYSTEM_IBM_X40 default y if ADK_NATIVE_SYSTEM_IBM_X40 + default y if ADK_TARGET_SYSTEM_INTEL_ATOM + default y if ADK_NATIVE_SYSTEM_INTEL_ATOM default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default y if ADK_TARGET_SYSTEM_SHUTTLE_SA76G2 default n |