diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 07:48:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 07:48:24 -0700 |
commit | 97c68d00dbb2decda4b3dce79ce55df04246a834 (patch) | |
tree | f7c2f3185e4dfb073f6d268b4aa0a4d9a0015ece /include/linux/pktcdvd.h | |
parent | MN10300: Update the ASB2303 defconfig (diff) | |
parent | cfq-iosched: cache prio_tree root in cfqq->p_root (diff) | |
download | linux-dev-97c68d00dbb2decda4b3dce79ce55df04246a834.tar.xz linux-dev-97c68d00dbb2decda4b3dce79ce55df04246a834.zip |
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
cfq-iosched: cache prio_tree root in cfqq->p_root
cfq-iosched: fix bug with aliased request and cooperation detection
cfq-iosched: clear ->prio_trees[] on cfqd alloc
block: fix intermittent dm timeout based oops
umem: fix request_queue lock warning
block: simplify I/O stat accounting
pktcdvd.h should include mempool.h
cfq-iosched: use the default seek distance when there aren't enough seek samples
cfq-iosched: make seek_mean converge more quickly
block: make blk_abort_queue() ignore non-request based devices
block: include empty disks in /proc/diskstats
bio: use bio_kmalloc() in copy/map functions
bio: fix bio_kmalloc()
block: fix queue bounce limit setting
block: fix SG_IO vector request data length handling
scatterlist: make sure sg_miter_next() doesn't return 0 sized mappings
Diffstat (limited to 'include/linux/pktcdvd.h')
-rw-r--r-- | include/linux/pktcdvd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pktcdvd.h b/include/linux/pktcdvd.h index 04b4d7330e6d..d745f5b6c7b0 100644 --- a/include/linux/pktcdvd.h +++ b/include/linux/pktcdvd.h @@ -113,6 +113,7 @@ struct pkt_ctrl_command { #include <linux/cdrom.h> #include <linux/kobject.h> #include <linux/sysfs.h> +#include <linux/mempool.h> /* default bio write queue congestion marks */ #define PKT_WRITE_CONGESTION_ON 10000 |