diff options
| author | Thomas Gleixner | 2010-12-09 18:19:13 +0100 |
|---|---|---|
| committer | Thomas Gleixner | 2010-12-09 18:19:21 +0100 |
| commit | 51ddafcbc735155a7e946b8b6ff19fcd5351375b (patch) | |
| tree | 4900cfc546494d84cdbf0b693d89b5a130d5f0ee /arch/x86/pci/Makefile | |
| parent | d834a9dcecae834cd6b2bc5e50e1907738d9cf6a (diff) | |
| parent | 991cfffa7c19aa648546aff666595af896e568ba (diff) | |
Merge branch 'x86/platform' into x86/apic-cleanups
Reason: apic cleanup series depends on x86/apic, x86/amd-nb and x86/platform
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/pci/Makefile')
| -rw-r--r-- | arch/x86/pci/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile index effd96e33f16..6b8759f7634e 100644 --- a/arch/x86/pci/Makefile +++ b/arch/x86/pci/Makefile @@ -7,6 +7,7 @@ obj-$(CONFIG_PCI_OLPC) += olpc.o obj-$(CONFIG_PCI_XEN) += xen.o obj-y += fixup.o +obj-$(CONFIG_X86_INTEL_CE) += ce4100.o obj-$(CONFIG_ACPI) += acpi.o obj-y += legacy.o irq.o |