diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
| commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
| tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /target/linux/config/Config.in.graphics | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/linux/config/Config.in.graphics')
| -rw-r--r-- | target/linux/config/Config.in.graphics | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/config/Config.in.graphics b/target/linux/config/Config.in.graphics index 874e81017..69412f3b0 100644 --- a/target/linux/config/Config.in.graphics +++ b/target/linux/config/Config.in.graphics @@ -1,3 +1,6 @@ +menu "Graphic devices support" +depends on ADK_TARGET_WITH_VGA || ADK_HARDWARE_QEMU + config ADK_KERNEL_VT boolean default y if ADK_HARDWARE_VBOX @@ -26,9 +29,9 @@ config ADK_KERNEL_FB boolean config ADK_KERNEL_FRAMEBUFFER_CONSOLE + boolean default y if ADK_TARGET_SYSTEM_ARANYM_M68K default n - boolean config ADK_KERNEL_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY boolean @@ -97,9 +100,6 @@ config ADK_KERNEL_AGP_INTEL config ADK_KERNEL_LOGO boolean -menu "Graphic devices support" -depends on ADK_TARGET_WITH_VGA || ADK_HARDWARE_QEMU - config ADK_KERNEL_LOGO_LINUX_CLUT224 prompt "Enable Linux penguin boot logo" boolean |