diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-13 10:15:35 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-03-13 10:15:35 +1100 |
| commit | aba0eb84c87928992c021d33ef3ea59c931086b9 (patch) | |
| tree | bdc323efc6773d0dcce4406ca275e9192eabb9b2 /arch/powerpc/platforms/pseries/Makefile | |
| parent | 7230c5644188cd9e3fb380cc97dde00c464a3ba7 (diff) | |
| parent | 3780444c4fcec28c96ab7002858bb051215a5fc1 (diff) | |
Merge branch 'eeh' into next
Diffstat (limited to 'arch/powerpc/platforms/pseries/Makefile')
| -rw-r--r-- | arch/powerpc/platforms/pseries/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile index 67b3e6e0cf3..c222189f5bb 100644 --- a/arch/powerpc/platforms/pseries/Makefile +++ b/arch/powerpc/platforms/pseries/Makefile @@ -6,7 +6,8 @@ obj-y := lpar.o hvCall.o nvram.o reconfig.o \ firmware.o power.o dlpar.o mobility.o obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_SCANLOG) += scanlog.o -obj-$(CONFIG_EEH) += eeh.o eeh_cache.o eeh_driver.o eeh_event.o eeh_sysfs.o +obj-$(CONFIG_EEH) += eeh.o eeh_dev.o eeh_cache.o eeh_driver.o \ + eeh_event.o eeh_sysfs.o eeh_pseries.o obj-$(CONFIG_KEXEC) += kexec.o obj-$(CONFIG_PCI) += pci.o pci_dlpar.o obj-$(CONFIG_PSERIES_MSI) += msi.o |