diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2007-02-17 19:18:34 +0300 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2007-02-17 19:18:34 +0300 |
| commit | 975b89399679dcf8587288d46d3f21d4286af167 (patch) | |
| tree | 5e634b6d99313865fb47e9f6f3408d25b47f1098 /arch/powerpc/platforms/pseries/Makefile | |
| parent | 578f8f20f3c7e2c18083cf3bd434df994280af30 (diff) | |
| parent | fc7900bb04c4290f3a8e43abf231aee566feff6d (diff) | |
| download | linux-975b89399679dcf8587288d46d3f21d4286af167.tar.xz | |
Merge branch 'master' into 85xx
Diffstat (limited to 'arch/powerpc/platforms/pseries/Makefile')
| -rw-r--r-- | arch/powerpc/platforms/pseries/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile index dc0583bdbc63..2dfd05095a25 100644 --- a/arch/powerpc/platforms/pseries/Makefile +++ b/arch/powerpc/platforms/pseries/Makefile @@ -4,7 +4,7 @@ endif obj-y := pci.o lpar.o hvCall.o nvram.o reconfig.o \ setup.o iommu.o ras.o rtasd.o pci_dlpar.o \ - firmware.o + firmware.o power.o obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_XICS) += xics.o obj-$(CONFIG_SCANLOG) += scanlog.o |