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 'vmwgfx-next-3.13' of git://people.freedesktop.org/~thomash/linux into...
[cascardo/linux.git]
/
block
/
Makefile
diff --git
a/block/Makefile
b/block/Makefile
index
4fa4be5
..
671a83d
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