projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...
[cascardo/linux.git]
/
drivers
/
misc
/
Makefile
diff --git
a/drivers/misc/Makefile
b/drivers/misc/Makefile
index
8f3efb6
..
b26495a
100644
(file)
--- a/
drivers/misc/Makefile
+++ b/
drivers/misc/Makefile
@@
-47,3
+47,4
@@
obj-$(CONFIG_AB8500_PWM) += ab8500-pwm.o
obj-y += lis3lv02d/
obj-y += carma/
obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
+obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/