git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
Makefile
diff --git
a/arch/x86/kernel/Makefile
b/arch/x86/kernel/Makefile
index f60153d5de5747b4d23a3da9e385f24a191715fa..34244b2cd880cff373e744ec34193adb8287ab2a 100644
(file)
--- a/
arch/x86/kernel/Makefile
+++ b/
arch/x86/kernel/Makefile
@@
-45,6
+45,7
@@
obj-y += pci-dma.o quirks.o i8237.o topology.o kdebugfs.o
obj-y += alternative.o i8253.o pci-nommu.o hw_breakpoint.o
obj-y += tsc.o io_delay.o rtc.o
obj-y += pci-iommu_table.o
+obj-y += resource.o
obj-$(CONFIG_X86_TRAMPOLINE) += trampoline.o
obj-y += process.o