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 tag 'char-misc-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregk...
[sfrench/cifs-2.6.git]
/
drivers
/
misc
/
Makefile
diff --git
a/drivers/misc/Makefile
b/drivers/misc/Makefile
index b76d611c87de12dbcc6d27e802b45a41c5df6f00..e39ccbbc1b3a83b6b640ec3ab9bc50e986877011 100644
(file)
--- a/
drivers/misc/Makefile
+++ b/
drivers/misc/Makefile
@@
-57,5
+57,5
@@
obj-$(CONFIG_ASPEED_LPC_CTRL) += aspeed-lpc-ctrl.o
obj-$(CONFIG_ASPEED_LPC_SNOOP) += aspeed-lpc-snoop.o
obj-$(CONFIG_PCI_ENDPOINT_TEST) += pci_endpoint_test.o
obj-$(CONFIG_OCXL) += ocxl/
-obj-
$(CONFIG_MISC_RTSX)
+= cardreader/
+obj-
y
+= cardreader/
obj-$(CONFIG_PVPANIC) += pvpanic.o