Merge commit 'b33612d03540fda7fa67485f1c20395beb7a2bf0' into upstream-merge

* commit 'b33612d03540fda7fa67485f1c20395beb7a2bf0':
  Fix -enable-kvm
  Restore terminal monitor attributes - addition
  Don't check for bus master for old guests
  usb: class specific interface requests
  Add missing #include needed for madvise() on OpenBSD
  Fix i386-bsd-user build
  Get bsd-user host page protection code working on FreeBSD hosts
  Fix bsd-user qemu_vmalloc() host page protection code
  Fix some compilation warnings on FreeBSD hosts
  Use sysctl instead of /proc to find executable path on FreeBSD
  Compile most PPC devices only once

Conflicts:
	Makefile.target

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

1 files changed, 3 insertions, 5 deletions

diff --git a/Makefile.target b/Makefile.target
index 1ed930db8..3f55fad6d 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -220,17 +220,15 @@ obj-ppc-y += vga.o dma.o
 # PREP target
 obj-ppc-y += pckbd.o i8259.o i8254.o mc146818rtc.o
 obj-ppc-y += ppc_prep.o
-# Mac shared devices
-obj-ppc-y += macio.o cuda.o adb.o mac_nvram.o mac_dbdma.o
 # OldWorld PowerMac
-obj-ppc-y += heathrow_pic.o grackle_pci.o ppc_oldworld.o
+obj-ppc-y += ppc_oldworld.o
 # NewWorld PowerMac
-obj-ppc-y += unin_pci.o ppc_newworld.o dec_pci.o
+obj-ppc-y += ppc_newworld.o
 # PowerPC 4xx boards
 obj-ppc-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o
 obj-ppc-y += ppc440.o ppc440_bamboo.o
 # PowerPC E500 boards
-obj-ppc-y += ppce500_pci.o ppce500_mpc8544ds.o
+obj-ppc-y += ppce500_mpc8544ds.o
 obj-ppc-$(CONFIG_KVM) += kvm_ppc.o
 obj-ppc-$(CONFIG_FDT) += device_tree.o