diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-03 03:17:01 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-03 03:17:01 -0400 |
| commit | 53ba4f2fa73225113a488584df0d85d3cba52943 (patch) | |
| tree | d85b984d9818abc3ccc0237eb53b710d9e96c39e /drivers/block/paride/pd.c | |
| parent | bd6d29c25bb1a24a4c160ec5de43e0004e01f72b (diff) | |
| parent | 66f41d4c5c8a5deed66fdcc84509376c9a0bf9d8 (diff) | |
Merge commit 'v2.6.34-rc6' into core/locking
Diffstat (limited to 'drivers/block/paride/pd.c')
| -rw-r--r-- | drivers/block/paride/pd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c index e712cd51af15..c1e5cd029b23 100644 --- a/drivers/block/paride/pd.c +++ b/drivers/block/paride/pd.c | |||
| @@ -145,6 +145,7 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_GEO, D_SBY, D_DLY, D_SLV}; | |||
| 145 | 145 | ||
| 146 | #include <linux/init.h> | 146 | #include <linux/init.h> |
| 147 | #include <linux/module.h> | 147 | #include <linux/module.h> |
| 148 | #include <linux/gfp.h> | ||
| 148 | #include <linux/fs.h> | 149 | #include <linux/fs.h> |
| 149 | #include <linux/delay.h> | 150 | #include <linux/delay.h> |
| 150 | #include <linux/hdreg.h> | 151 | #include <linux/hdreg.h> |