diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-27 12:18:47 -0400 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-27 12:18:47 -0400 |
| commit | 544cbbaed4de962fb0e831e8799ab01c448ff37d (patch) | |
| tree | 3f03ca171a9f8c2e80bdca050d8714994cd6de9f /arch/ppc64/kernel/Makefile | |
| parent | 99a2379cdddcc4e8579e70deb80479450ed65d49 (diff) | |
powerpc: Merge HvLpEvent.c into lpevents.c
These two files were intimately connected, so just merge them.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Diffstat (limited to 'arch/ppc64/kernel/Makefile')
| -rw-r--r-- | arch/ppc64/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/Makefile b/arch/ppc64/kernel/Makefile index f84ae358db0a..a4e5c5b86c74 100644 --- a/arch/ppc64/kernel/Makefile +++ b/arch/ppc64/kernel/Makefile | |||
| @@ -22,7 +22,7 @@ pci-obj-$(CONFIG_PPC_MULTIPLATFORM) += pci_dn.o pci_direct_iommu.o | |||
| 22 | 22 | ||
| 23 | obj-$(CONFIG_PCI) += pci.o pci_iommu.o iomap.o $(pci-obj-y) | 23 | obj-$(CONFIG_PCI) += pci.o pci_iommu.o iomap.o $(pci-obj-y) |
| 24 | 24 | ||
| 25 | obj-$(CONFIG_PPC_ISERIES) += HvLpEvent.o iSeries_proc.o iSeries_htab.o \ | 25 | obj-$(CONFIG_PPC_ISERIES) += iSeries_proc.o iSeries_htab.o \ |
| 26 | iSeries_iommu.o | 26 | iSeries_iommu.o |
| 27 | 27 | ||
| 28 | obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o | 28 | obj-$(CONFIG_PPC_MULTIPLATFORM) += nvram.o i8259.o prom_init.o |