diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 14:06:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 14:06:41 -0400 |
| commit | 6a5d263866d699ebf6843105497afc86ee53de5b (patch) | |
| tree | 439195e272631908cdc2e3e44abaf7e1c3447157 /drivers/block/Makefile | |
| parent | aeeae86859f4319de0a4946b44771d9926eeed54 (diff) | |
| parent | ffcd7dca3ab78f9f425971756e5e90024157f6be (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:
loop: mutex already unlocked in loop_clr_fd()
cfq-iosched: don't let idling interfere with plugging
block: remove unused REQ_UNPLUG
cfq-iosched: kill two unused cfqq flags
cfq-iosched: change dispatch logic to deal with single requests at the time
mflash: initial support
cciss: change to discover first memory BAR
cciss: kernel scan thread for MSA2012
cciss: fix residual count for block pc requests
block: fix inconsistency in I/O stat accounting code
block: elevator quiescing helpers
Diffstat (limited to 'drivers/block/Makefile')
| -rw-r--r-- | drivers/block/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/Makefile b/drivers/block/Makefile index 3145141cef72..7755a5e2a85e 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile | |||
| @@ -21,6 +21,7 @@ obj-$(CONFIG_BLK_CPQ_CISS_DA) += cciss.o | |||
| 21 | obj-$(CONFIG_BLK_DEV_DAC960) += DAC960.o | 21 | obj-$(CONFIG_BLK_DEV_DAC960) += DAC960.o |
| 22 | obj-$(CONFIG_XILINX_SYSACE) += xsysace.o | 22 | obj-$(CONFIG_XILINX_SYSACE) += xsysace.o |
| 23 | obj-$(CONFIG_CDROM_PKTCDVD) += pktcdvd.o | 23 | obj-$(CONFIG_CDROM_PKTCDVD) += pktcdvd.o |
| 24 | obj-$(CONFIG_MG_DISK) += mg_disk.o | ||
| 24 | obj-$(CONFIG_SUNVDC) += sunvdc.o | 25 | obj-$(CONFIG_SUNVDC) += sunvdc.o |
| 25 | 26 | ||
| 26 | obj-$(CONFIG_BLK_DEV_UMEM) += umem.o | 27 | obj-$(CONFIG_BLK_DEV_UMEM) += umem.o |