projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
block
/
Makefile
diff --git
a/block/Makefile
b/block/Makefile
index
c05de0e
..
4b84d0d
100644
(file)
--- a/
block/Makefile
+++ b/
block/Makefile
@@
-2,7
+2,7
@@
# Makefile for the kernel block layer
#
# Makefile for the kernel block layer
#
-obj-
y
:= elevator.o ll_rw_blk.o ioctl.o genhd.o scsi_ioctl.o
+obj-
$(CONFIG_BLOCK)
:= elevator.o ll_rw_blk.o ioctl.o genhd.o scsi_ioctl.o
obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
obj-$(CONFIG_IOSCHED_AS) += as-iosched.o
obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
obj-$(CONFIG_IOSCHED_AS) += as-iosched.o