diff options
| author | Dave Jones <davej@redhat.com> | 2007-02-10 20:36:29 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2007-02-10 20:36:29 -0500 |
| commit | bd0561c9d8dcbf21cd9aa46c416bbf6a3a12e4b1 (patch) | |
| tree | 64fe15d4db42e0840acea00e4cf7e1855bba9e96 /arch/ppc/kernel/Makefile | |
| parent | 348f31ed2bd18391fe5903aa0ad7bfcda6d8ca0b (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
[CPUFREQ] Fix up merge conflicts with recent ACPI changes.
Signed-off-by: Dave Jones <davej@redhat.com>
Diffstat (limited to 'arch/ppc/kernel/Makefile')
| -rw-r--r-- | arch/ppc/kernel/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile index 466437f4bcbb..6b4f022111e7 100644 --- a/arch/ppc/kernel/Makefile +++ b/arch/ppc/kernel/Makefile | |||
| @@ -12,7 +12,6 @@ obj-y := entry.o traps.o time.o misc.o \ | |||
| 12 | setup.o \ | 12 | setup.o \ |
| 13 | ppc_htab.o | 13 | ppc_htab.o |
| 14 | obj-$(CONFIG_MODULES) += ppc_ksyms.o | 14 | obj-$(CONFIG_MODULES) += ppc_ksyms.o |
| 15 | obj-$(CONFIG_NOT_COHERENT_CACHE) += dma-mapping.o | ||
| 16 | obj-$(CONFIG_PCI) += pci.o | 15 | obj-$(CONFIG_PCI) += pci.o |
| 17 | obj-$(CONFIG_RAPIDIO) += rio.o | 16 | obj-$(CONFIG_RAPIDIO) += rio.o |
| 18 | obj-$(CONFIG_KGDB) += ppc-stub.o | 17 | obj-$(CONFIG_KGDB) += ppc-stub.o |