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 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[sfrench/cifs-2.6.git]
/
drivers
/
sn
/
Makefile
diff --git
a/drivers/sn/Makefile
b/drivers/sn/Makefile
index c2a2841853727d0cf02baa87e0d260ffac1114de..2cda011597c0e018ea931a2393f59526effeba9a 100644
(file)
--- a/
drivers/sn/Makefile
+++ b/
drivers/sn/Makefile
@@
-4,3
+4,4
@@
#
obj-$(CONFIG_SGI_IOC4) += ioc4.o
+obj-$(CONFIG_SGI_IOC3) += ioc3.o