diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-23 16:39:17 +0200 |
| commit | 2735fdf97305e110eba8e776f8728a52ae886c05 (patch) | |
| tree | 0ce26ce1066bd7260625ca641b1e64c99015f47f /target/x86/sys-available/generic-pc | |
| parent | 65c2ab93616bdf982152a94ab35c2079a5e3a2d7 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/x86/sys-available/generic-pc')
| -rw-r--r-- | target/x86/sys-available/generic-pc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/target/x86/sys-available/generic-pc b/target/x86/sys-available/generic-pc index 72ae99765..b5bbca9f2 100644 --- a/target/x86/sys-available/generic-pc +++ b/target/x86/sys-available/generic-pc @@ -1,10 +1,9 @@ config ADK_TARGET_SYSTEM_GENERIC_PC - bool "Generic PC (486)" + bool "Generic PC" select ADK_x86 select ADK_generic_pc - select ADK_CPU_I486 select ADK_TARGET_KERNEL_BZIMAGE select ADK_PACKAGE_GRUB help - Support for generic PC (i486). + Support for generic PC. |