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/generic-pc | |
| parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) | |
resolve merge conflict
Diffstat (limited to 'target/x86/kernel/generic-pc')
| -rw-r--r-- | target/x86/kernel/generic-pc | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/target/x86/kernel/generic-pc b/target/x86/kernel/generic-pc index 8b26b4d30..9c844d2b2 100644 --- a/target/x86/kernel/generic-pc +++ b/target/x86/kernel/generic-pc @@ -1,20 +1,5 @@ CONFIG_X86=y CONFIG_X86_32=y -CONFIG_PCI=y -CONFIG_PCI_GOANY=y -CONFIG_PCI_BIOS=y -CONFIG_PCI_DIRECT=y -CONFIG_PCI_DOMAINS=y -CONFIG_NET_VENDOR_NATSEMI=y -CONFIG_NET_VENDOR_8390=y -CONFIG_NE2K_PCI=y -CONFIG_PCNET32=y -CONFIG_NET_VENDOR_REALTEK=y -CONFIG_RTL8139CP=y -CONFIG_8139TOO=y -CONFIG_NET_VENDOR_INTEL=y -CONFIG_E100=y -CONFIG_E1000=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_ATA=y |