diff options
author | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-06-20 12:35:34 -0400 |
commit | 8ba08378b479f472b37b83542c31bdad465033cf (patch) | |
tree | f4421227b3065e786c9041cf0ce0073a249e011b /arch/arm/mach-integrator/Makefile | |
parent | 34b727c135ff651f153be5757056d25678b6d018 (diff) | |
parent | 8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/arm/mach-integrator/Makefile')
-rw-r--r-- | arch/arm/mach-integrator/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-integrator/Makefile b/arch/arm/mach-integrator/Makefile index 158daaf9e3b0..ebb255bdce8a 100644 --- a/arch/arm/mach-integrator/Makefile +++ b/arch/arm/mach-integrator/Makefile | |||
@@ -12,3 +12,4 @@ obj-$(CONFIG_LEDS) += leds.o | |||
12 | obj-$(CONFIG_PCI) += pci_v3.o pci.o | 12 | obj-$(CONFIG_PCI) += pci_v3.o pci.o |
13 | obj-$(CONFIG_CPU_FREQ_INTEGRATOR) += cpu.o | 13 | obj-$(CONFIG_CPU_FREQ_INTEGRATOR) += cpu.o |
14 | obj-$(CONFIG_INTEGRATOR_IMPD1) += impd1.o | 14 | obj-$(CONFIG_INTEGRATOR_IMPD1) += impd1.o |
15 | obj-$(CONFIG_SMP) += platsmp.o headsmp.o | ||