qemu-e2k/hw/ide
Anthony Liguori 4ceb193d30 Merge remote-tracking branch 'bonzini/hw-dirs' into staging
* bonzini/hw-dirs:
  exec: remove useless declarations from memory-internal.h
  memory: move core typedefs to qemu/typedefs.h
  include: avoid useless includes of exec/ headers
  sysemu: avoid proliferation of include/ subdirectories
  tpm: reorganize headers and split hardware part
  configure: fix TPM logic
  acpi.h: make it self contained
  acpi: move declarations from pc.h to acpi.h
  hw: Add lost ARM core again
  Fix failure to create q35 machine
  Add linux-headers to QEMU_INCLUDES
  arm: fix location of some include files

Conflicts:
	configure

aliguori: trivial conflict in configure output

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-04-15 17:06:04 -05:00
..
ahci.c include: avoid useless includes of exec/ headers 2013-04-15 18:19:26 +02:00
ahci.h
atapi.c hw: move headers to include/ 2013-04-08 18:13:10 +02:00
cmd646.c hw: move headers to include/ 2013-04-08 18:13:10 +02:00
core.c ide: refuse WIN_READ_NATIVE_MAX on empty device 2013-04-15 10:18:05 +02:00
ich.c hw: move headers to include/ 2013-04-08 18:13:10 +02:00
internal.h include: avoid useless includes of exec/ headers 2013-04-15 18:19:26 +02:00
isa.c hw: move headers to include/ 2013-04-08 18:13:10 +02:00
macio.c hw: move headers to include/ 2013-04-08 18:13:10 +02:00
Makefile.objs hw: make all of hw/ide/ configurable via default-configs/ 2013-04-08 18:13:12 +02:00
microdrive.c hw: move headers to include/ 2013-04-08 18:13:10 +02:00
mmio.c
pci.c hw: move headers to include/ 2013-04-08 18:13:10 +02:00
pci.h
piix.c hw: move headers to include/ 2013-04-08 18:13:10 +02:00
qdev.c hw: move headers to include/ 2013-04-08 18:13:10 +02:00
via.c hw: move headers to include/ 2013-04-08 18:13:10 +02:00