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 git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
[sfrench/cifs-2.6.git]
/
drivers
/
platform
/
Makefile
diff --git
a/drivers/platform/Makefile
b/drivers/platform/Makefile
index d3a6630266a07b10629953d8d06cbf7ba920923b..4b2ce58bcd9c62d29810222391073579d51de74b 100644
(file)
--- a/
drivers/platform/Makefile
+++ b/
drivers/platform/Makefile
@@
-4,6
+4,7
@@
#
obj-$(CONFIG_X86) += x86/
+obj-$(CONFIG_MELLANOX_PLATFORM) += mellanox/
obj-$(CONFIG_MIPS) += mips/
obj-$(CONFIG_OLPC) += olpc/
obj-$(CONFIG_GOLDFISH) += goldfish/