diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2011-10-08 10:01:46 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2011-10-08 10:01:46 +0000 |
| commit | 6c731dc2af1e80c410e8605098deb1ac16ab72f0 (patch) | |
| tree | 2d22e73f1e60ddff21fd4e6c1c8e9127b64b8868 /Makefile.objs | |
| parent | 6e19a1379d3d12c2d8f934aa8154037a609f4507 (diff) | |
| parent | 7c0a3409627604c111d5c5e1ce4e0224c2b56315 (diff) | |
Merge branch 'ppc-next' of git://repo.or.cz/qemu/agraf
* 'ppc-next' of git://repo.or.cz/qemu/agraf: (64 commits)
ppc64: Fix linker script
pseries: Implement set-time-of-day RTAS function
pseries: Refactor spapr irq allocation
PPC: Clean up BookE timer code
PPC: booke timers
KVM: PPC: Use HIOR setting for -M pseries with PR KVM
KVM: Update kernel headers
KVM: Update kernel headers
PPC: Fix heathrow PIC to use little endian MMIO
PPC: Fix via-cuda memory registration
ppc: move ADB stuff from ppc_mac.h to adb.h
openpic: Unfold write_IRQreg
openpic: Unfold read_IRQreg
ppc405: use RAM_ADDR_FMT instead of %08lx
Gdbstub: handle read of fpscr
vscsi: send the CHECK_CONDITION status down together with autosense data
pseries: Implement hcall-bulk hypervisor interface
Implement POWER7's CFAR in TCG
ppc: booke206: use MAV=2.0 TSIZE definition, fix 4G pages
ppc: booke206: add "info tlb" support
...
Diffstat (limited to 'Makefile.objs')
| -rw-r--r-- | Makefile.objs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile.objs b/Makefile.objs index 8d23fbbbee..c849e51122 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -222,7 +222,6 @@ hw-obj-$(CONFIG_SMARTCARD_NSS) += ccid-card-emulated.o hw-obj-$(CONFIG_USB_REDIR) += usb-redir.o # PPC devices -hw-obj-$(CONFIG_OPENPIC) += openpic.o hw-obj-$(CONFIG_PREP_PCI) += prep_pci.o # Mac shared devices hw-obj-$(CONFIG_MACIO) += macio.o |