diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:31 -0400 |
| commit | 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch) | |
| tree | 51c50bcb67a5039448ddfa1869d7948cab1217e9 /include/linux/pktcdvd.h | |
| parent | 19c1a6f5764d787113fa323ffb18be7991208f82 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base,
update it to .30-rc5 to refresh.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 { | |||
| 113 | #include <linux/cdrom.h> | 113 | #include <linux/cdrom.h> |
| 114 | #include <linux/kobject.h> | 114 | #include <linux/kobject.h> |
| 115 | #include <linux/sysfs.h> | 115 | #include <linux/sysfs.h> |
| 116 | #include <linux/mempool.h> | ||
| 116 | 117 | ||
| 117 | /* default bio write queue congestion marks */ | 118 | /* default bio write queue congestion marks */ |
| 118 | #define PKT_WRITE_CONGESTION_ON 10000 | 119 | #define PKT_WRITE_CONGESTION_ON 10000 |