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 remote-tracking branch 'asoc/topic/cq93vc' into asoc-next
[firefly-linux-kernel-4.4.55.git]
/
block
/
Makefile
diff --git
a/block/Makefile
b/block/Makefile
index 4fa4be544ece94c05d0956a0c6f488c1f7a65161..671a83d063a5ba290c93efc08457eba6217ea80d 100644
(file)
--- a/
block/Makefile
+++ b/
block/Makefile
@@
-18,4
+18,4
@@
obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o
obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o
-obj-$(CONFIG_
CMDLINE_PARSER)
+= cmdline-parser.o
+obj-$(CONFIG_
BLK_CMDLINE_PARSER)
+= cmdline-parser.o