Merge commit '956a3e6bb7386de48b642d4fee11f7f86a2fcf9a' into upstream-merge

* commit '956a3e6bb7386de48b642d4fee11f7f86a2fcf9a': (52 commits)
  Compile pckbd only once
  linux-user: do not warn for missing pselect6
  tcg-ia64: Load GUEST_BASE into a register.
  tcg-ia64: Fix some register usage issues.
  tcg-hppa: Load GUEST_BASE as an immediate.
  tcg: Initialize the prologue after GUEST_BASE is fixed.
  alpha-linux-user: Fix sigprocmask.
  alpha-linux-user: Fix sigsuspend parameters.
  alpha-linux-user: Fix getxpid.
  alpha-linux-user: Fix pipe return mechanism.
  alpha-linux-user: Add correct sigaction constants.
  alpha-linux-user: Fix siginfo.si_addr for SIGSEGV and SIGBUS.
  alpha-linux-user: Fix brk error return.
  tcg-i386: Nuke trailing whitespace.
  tcg-i386: Use lea for three-operand add.
  tcg-i386: Tidy lea.
  tcg-i386: Tidy xchg.
  tcg-i386: Tidy multiply.
  tcg-i386: Tidy unary arithmetic.
  tcg-i386: Tidy setcc.
  ...

Conflicts:
	Makefile.objs
	Makefile.target
	hw/pc.c

Signed-off-by: Avi Kivity <avi@redhat.com>

1 files changed, 6 insertions, 5 deletions

diff --git a/Makefile.target b/Makefile.target
index 9a158d243..a4239861b 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -203,9 +203,9 @@ obj-y += rtl8139.o
 obj-y += e1000.o
 
 # Hardware support
-obj-i386-y = pckbd.o dma.o
+obj-i386-y = dma.o
 obj-i386-y += vga.o
-obj-i386-y += mc146818rtc.o i8259.o i8254.o pcspk.o pc.o
+obj-i386-y += mc146818rtc.o i8259.o pc.o
 obj-i386-y += cirrus_vga.o apic.o ioapic.o piix_pci.o
 obj-i386-y += vmmouse.o vmport.o hpet.o
 obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o
@@ -215,6 +215,7 @@ obj-i386-y += pc_piix.o
 obj-i386-y += testdev.o
 obj-i386-y += acpi.o acpi_piix4.o
 
+obj-i386-y += pcspk.o i8254.o
 obj-i386-$(CONFIG_KVM_PIT) += i8254-kvm.o
 obj-i386-$(CONFIG_KVM_DEVICE_ASSIGNMENT) += device-assignment.o
 
@@ -229,7 +230,7 @@ obj-ia64-$(CONFIG_KVM_DEVICE_ASSIGNMENT) += device-assignment.o
 obj-ppc-y = ppc.o
 obj-ppc-y += vga.o dma.o
 # PREP target
-obj-ppc-y += pckbd.o i8259.o i8254.o mc146818rtc.o
+obj-ppc-y += i8259.o mc146818rtc.o
 obj-ppc-y += ppc_prep.o
 # OldWorld PowerMac
 obj-ppc-y += ppc_oldworld.o
@@ -247,7 +248,7 @@ obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
 obj-mips-y += mips_addr.o mips_timer.o mips_int.o
 obj-mips-y += dma.o vga.o i8254.o i8259.o
 obj-mips-y += g364fb.o jazz_led.o
-obj-mips-y += gt64xxx.o pckbd.o mc146818rtc.o
+obj-mips-y += gt64xxx.o mc146818rtc.o
 obj-mips-y += piix4.o cirrus_vga.o
 
 obj-microblaze-y = petalogix_s3adsp1800_mmu.o
@@ -271,7 +272,7 @@ obj-cris-y += etraxfs_timer.o
 obj-cris-y += etraxfs_ser.o
 
 ifeq ($(TARGET_ARCH), sparc64)
-obj-sparc-y = sun4u.o pckbd.o apb_pci.o
+obj-sparc-y = sun4u.o apb_pci.o
 obj-sparc-y += vga.o
 obj-sparc-y += mc146818rtc.o
 obj-sparc-y += cirrus_vga.o