diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2019-08-30 02:52:57 +0300 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-08-30 02:52:57 +0300 |
| commit | 9044adca782c065de182d28876808446b3a8ccde (patch) | |
| tree | f23ccbcfa9d5b0a886e65e4a3d8a146f86dea15b /arch/powerpc/platforms/powernv/Makefile | |
| parent | 07aa1e786d4fc93cf646797ce045510dd5e982ee (diff) | |
| parent | 68e0aa8ec5cedec48dd5b11df84afc956c8f85be (diff) | |
| download | linux-9044adca782c065de182d28876808446b3a8ccde.tar.xz | |
Merge branch 'topic/ppc-kvm' into next
Merge our ppc-kvm topic branch to bring in the Ultravisor support
patches.
Diffstat (limited to 'arch/powerpc/platforms/powernv/Makefile')
| -rw-r--r-- | arch/powerpc/platforms/powernv/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/powernv/Makefile b/arch/powerpc/platforms/powernv/Makefile index 69a3aefa905b..49186f0985a4 100644 --- a/arch/powerpc/platforms/powernv/Makefile +++ b/arch/powerpc/platforms/powernv/Makefile @@ -4,6 +4,7 @@ obj-y += idle.o opal-rtc.o opal-nvram.o opal-lpc.o opal-flash.o obj-y += rng.o opal-elog.o opal-dump.o opal-sysparam.o opal-sensor.o obj-y += opal-msglog.o opal-hmi.o opal-power.o opal-irqchip.o obj-y += opal-kmsg.o opal-powercap.o opal-psr.o opal-sensor-groups.o +obj-y += ultravisor.o obj-$(CONFIG_SMP) += smp.o subcore.o subcore-asm.o obj-$(CONFIG_PCI) += pci.o pci-ioda.o npu-dma.o pci-ioda-tce.o |