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/x86/kernel/ibm-x40 | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/x86/kernel/ibm-x40')
| -rw-r--r-- | target/x86/kernel/ibm-x40 | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/target/x86/kernel/ibm-x40 b/target/x86/kernel/ibm-x40 index 816e76ca9..eb53a4fec 100644 --- a/target/x86/kernel/ibm-x40 +++ b/target/x86/kernel/ibm-x40 @@ -5,18 +5,6 @@ CONFIG_CPU_SUP_INTEL=y CONFIG_NR_CPUS=1 CONFIG_VM86=y CONFIG_X86_REBOOTFIXUPS=y -CONFIG_SCSI=y -CONFIG_SCSI_DMA=y -CONFIG_BLK_DEV_SD=y -CONFIG_ATA=y -CONFIG_SATA_PMP=y -CONFIG_ATA_SFF=y -CONFIG_ATA_BMDMA=y -CONFIG_ATA_PIIX=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_FIX_EARLYCON_MEM=y -CONFIG_SERIAL_8250_NR_UARTS=2 -CONFIG_SERIAL_8250_RUNTIME_UARTS=2 |