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 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[sfrench/cifs-2.6.git]
/
drivers
/
mfd
/
Makefile
diff --git
a/drivers/mfd/Makefile
b/drivers/mfd/Makefile
index 51432091b323f9edad3fedfa0a0fad5269a9a9f9..521cd5cb68af3fc8a5692270f27f8f1e866f974d 100644
(file)
--- a/
drivers/mfd/Makefile
+++ b/
drivers/mfd/Makefile
@@
-3,6
+3,7
@@
#
obj-$(CONFIG_MFD_SM501) += sm501.o
+obj-$(CONFIG_MFD_ASIC3) += asic3.o
obj-$(CONFIG_MCP) += mcp-core.o
obj-$(CONFIG_MCP_SA11X0) += mcp-sa11x0.o