diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-09 11:45:21 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-09 11:45:21 -0800 |
| commit | aceb91cd351bc3a19a783c901fe8a8070d5f6fa9 (patch) | |
| tree | a0863e940a77ae10d3c8b391488e29a8245b31be /drivers/block/aoe/Makefile | |
| parent | ae8eed2d0906bf0d8eb0c2a4651676a41d361297 (diff) | |
| parent | b8cf0e0e552ca48e9a00f518aeb4f5e03984022b (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cdrom: support devices that have check_events but not media_changed
cfq-iosched: Don't wait if queue already has requests.
blkio-throttle: Avoid calling blkiocg_lookup_group() for root group
cfq: rename a function to give it more appropriate name
cciss: make cciss_revalidate not loop through CISS_MAX_LUNS volumes unnecessarily.
drivers/block/aoe/Makefile: replace the use of <module>-objs with <module>-y
loop: queue_lock NULL pointer derefence in blk_throtl_exit
drivers/block/Makefile: replace the use of <module>-objs with <module>-y
blktrace: Don't output messages if NOTIFY isn't set.
Diffstat (limited to 'drivers/block/aoe/Makefile')
| -rw-r--r-- | drivers/block/aoe/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/aoe/Makefile b/drivers/block/aoe/Makefile index e76d997183c..06ea82cdf27 100644 --- a/drivers/block/aoe/Makefile +++ b/drivers/block/aoe/Makefile @@ -3,4 +3,4 @@ # obj-$(CONFIG_ATA_OVER_ETH) += aoe.o -aoe-objs := aoeblk.o aoechr.o aoecmd.o aoedev.o aoemain.o aoenet.o +aoe-y := aoeblk.o aoechr.o aoecmd.o aoedev.o aoemain.o aoenet.o |