projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'iwlwifi-for-kalle-2015-07-30' of https://git.kernel.org/pub/scm/linux...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
misc
/
Makefile
diff --git
a/drivers/misc/Makefile
b/drivers/misc/Makefile
index 7d5c4cd118c44fbf052425d2d61e3ec3cc1ae455..d056fb7186fe1b31867457abb3e56b18ab1beb10 100644
(file)
--- a/
drivers/misc/Makefile
+++ b/
drivers/misc/Makefile
@@
-44,7
+44,6
@@
obj-$(CONFIG_ARM_CHARLCD) += arm-charlcd.o
obj-$(CONFIG_PCH_PHUB) += pch_phub.o
obj-y += ti-st/
obj-y += lis3lv02d/
-obj-y += carma/
obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o
obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/
obj-$(CONFIG_INTEL_MEI) += mei/