diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 08:23:04 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-05-17 08:23:04 -0400 |
commit | 5cf4cf65a8ccca44ec9b357ebdb2b517269d7e8a (patch) | |
tree | beba3ecc27c64e0c22b1a21201f1999afe9834f2 /arch/sparc64/kernel/Makefile | |
parent | 55d3ecab2d16be3525ba24a96ba3a67692af1f09 (diff) | |
parent | b2cd64153b94473f6bd82448a68b8e8c041676ea (diff) | |
download | linux-5cf4cf65a8ccca44ec9b357ebdb2b517269d7e8a.tar.gz |
Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/
Diffstat (limited to 'arch/sparc64/kernel/Makefile')
-rw-r--r-- | arch/sparc64/kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/Makefile b/arch/sparc64/kernel/Makefile index 6bf6fb65bc20..c749dccacc32 100644 --- a/arch/sparc64/kernel/Makefile +++ b/arch/sparc64/kernel/Makefile @@ -12,7 +12,7 @@ obj-y := process.o setup.o cpu.o idprom.o \ irq.o ptrace.o time.o sys_sparc.o signal.o \ unaligned.o central.o pci.o starfire.o semaphore.o \ power.o sbus.o iommu_common.o sparc64_ksyms.o chmc.o \ - visemul.o prom.o of_device.o + visemul.o prom.o of_device.o hvapi.o obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-$(CONFIG_PCI) += ebus.o isa.o pci_common.o pci_iommu.o \ |