diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-17 22:24:44 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-02-17 22:24:44 +0100 |
commit | da133cad10885ca36be26b1b043c737e295a4cd4 (patch) | |
tree | 3fb8e1189dce7188c4681144f96982d30c4511bd /target/sparc64/kernel/qemu-sparc64 | |
parent | 638c9f989542642d52859a56913ae5c2ace93e69 (diff) | |
parent | 642a45334676311b50bd2b45ae49c45f8b86c86d (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
TODO
Diffstat (limited to 'target/sparc64/kernel/qemu-sparc64')
-rw-r--r-- | target/sparc64/kernel/qemu-sparc64 | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/target/sparc64/kernel/qemu-sparc64 b/target/sparc64/kernel/qemu-sparc64 index 73e26ec4d..5119f1225 100644 --- a/target/sparc64/kernel/qemu-sparc64 +++ b/target/sparc64/kernel/qemu-sparc64 @@ -16,10 +16,6 @@ CONFIG_SCSI=y CONFIG_SCSI_DMA=y CONFIG_BLK_DEV_SD=y CONFIG_SCSI_LOWLEVEL=y -CONFIG_ATA=y -CONFIG_ATA_SFF=y -CONFIG_ATA_BMDMA=y -CONFIG_PATA_CMD64X=y CONFIG_NETDEVICES=y CONFIG_NET_CORE=y CONFIG_ETHERNET=y |