diff options
| author | Anthony Liguori <aliguori@amazon.com> | 2013-10-18 10:01:37 -0700 |
|---|---|---|
| committer | Anthony Liguori <aliguori@amazon.com> | 2013-10-18 10:01:37 -0700 |
| commit | 1cb9b64df380f232bcd142ab27c085cff0add1d8 (patch) | |
| tree | 9b09a466f5b51e6923cf31fd52d1f3d8ca2ba39a /default-configs/ppc-softmmu.mak | |
| parent | c21611ab8d0d6e0b3f3e5483777b5c929fb5a96c (diff) | |
| parent | 2324841c0275f31505168e7a6ceb71bcede92d33 (diff) | |
Merge remote-tracking branch 'bonzini/configure' into staging
# By Peter Maydell (3) and Ákos Kovács (2)
# Via Paolo Bonzini
* bonzini/configure:
ui/Makefile.objs: delete unnecessary cocoa.o dependency
default-configs/: CONFIG_GDBSTUB_XML removed
Makefile.target: CONFIG_NO_* variables removed
rules.mak: New string testing functions
rules.mak: New logical functions for handling y/n values
Diffstat (limited to 'default-configs/ppc-softmmu.mak')
| -rw-r--r-- | default-configs/ppc-softmmu.mak | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak index eac0b28fb9..f5cd0bdcc0 100644 --- a/default-configs/ppc-softmmu.mak +++ b/default-configs/ppc-softmmu.mak @@ -3,7 +3,6 @@ include pci.mak include sound.mak include usb.mak -CONFIG_GDBSTUB_XML=y CONFIG_ISA_MMIO=y CONFIG_ESCC=y CONFIG_M48T59=y |