git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux...
[pandora-kernel.git]
/
arch
/
x86
/
pci
/
Makefile
diff --git
a/arch/x86/pci/Makefile
b/arch/x86/pci/Makefile
index
effd96e
..
6b8759f
100644
(file)
--- 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