diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-09-16 11:07:13 +0200 |
| commit | 5861b2783c0615345b80a93470312b36d1cb9907 (patch) | |
| tree | 42ded4821e0834063449a5620a1b46bc6f1e509b /target/linux/config/Config.in.serial | |
| parent | e3d296fa18ef060fad7e654cd9308e57ffd0934b (diff) | |
| parent | d8a75c17f7cb861b42f327afc9a9ec3901133d2c (diff) | |
fix conflict
Diffstat (limited to 'target/linux/config/Config.in.serial')
| -rw-r--r-- | target/linux/config/Config.in.serial | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index adc25312d..d1497d2fd 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -1,10 +1,12 @@ config ADK_KERNEL_SERIAL_PXA boolean default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ + default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS config ADK_KERNEL_SERIAL_PXA_CONSOLE boolean default y if ADK_TARGET_QEMU_ARM_MODEL_SPITZ + default y if ADK_TARGET_SYSTEM_SHARP_ZAURUS config ADK_KERNEL_SERIAL_AMBA_PL011 boolean |