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-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
pci
/
Makefile
diff --git
a/arch/x86/pci/Makefile
b/arch/x86/pci/Makefile
index 0b7d3e9593e157cb328db23c922f5c3c6cde8d20..b110d97fb9254b564d46b423ab2378bc547a197d 100644
(file)
--- a/
arch/x86/pci/Makefile
+++ b/
arch/x86/pci/Makefile
@@
-13,6
+13,8
@@
obj-$(CONFIG_X86_VISWS) += visws.o
obj-$(CONFIG_X86_NUMAQ) += numaq_32.o
+obj-$(CONFIG_X86_MRST) += mrst.o
+
obj-y += common.o early.o
obj-y += amd_bus.o bus_numa.o