diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /drivers/block | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/acsi.c | 1 | ||||
| -rw-r--r-- | drivers/block/paride/pd.c | 1 | ||||
| -rw-r--r-- | drivers/block/umem.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/block/acsi.c b/drivers/block/acsi.c index 706cdc6a69ec..e3d9152e231a 100644 --- a/drivers/block/acsi.c +++ b/drivers/block/acsi.c | |||
| @@ -46,7 +46,6 @@ | |||
| 46 | #include <linux/module.h> | 46 | #include <linux/module.h> |
| 47 | #include <linux/errno.h> | 47 | #include <linux/errno.h> |
| 48 | #include <linux/signal.h> | 48 | #include <linux/signal.h> |
| 49 | #include <linux/sched.h> | ||
| 50 | #include <linux/timer.h> | 49 | #include <linux/timer.h> |
| 51 | #include <linux/fs.h> | 50 | #include <linux/fs.h> |
| 52 | #include <linux/kernel.h> | 51 | #include <linux/kernel.h> |
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c index 9d9bff23f426..99e2c8ce1cc4 100644 --- a/drivers/block/paride/pd.c +++ b/drivers/block/paride/pd.c | |||
| @@ -153,7 +153,6 @@ enum {D_PRT, D_PRO, D_UNI, D_MOD, D_GEO, D_SBY, D_DLY, D_SLV}; | |||
| 153 | #include <linux/blkpg.h> | 153 | #include <linux/blkpg.h> |
| 154 | #include <linux/kernel.h> | 154 | #include <linux/kernel.h> |
| 155 | #include <asm/uaccess.h> | 155 | #include <asm/uaccess.h> |
| 156 | #include <linux/sched.h> | ||
| 157 | #include <linux/workqueue.h> | 156 | #include <linux/workqueue.h> |
| 158 | 157 | ||
| 159 | static DEFINE_SPINLOCK(pd_lock); | 158 | static DEFINE_SPINLOCK(pd_lock); |
diff --git a/drivers/block/umem.c b/drivers/block/umem.c index 30f16bd83650..dff3766f117f 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | */ | 35 | */ |
| 36 | 36 | ||
| 37 | //#define DEBUG /* uncomment if you want debugging info (pr_debug) */ | 37 | //#define DEBUG /* uncomment if you want debugging info (pr_debug) */ |
| 38 | #include <linux/sched.h> | ||
| 39 | #include <linux/fs.h> | 38 | #include <linux/fs.h> |
| 40 | #include <linux/bio.h> | 39 | #include <linux/bio.h> |
| 41 | #include <linux/kernel.h> | 40 | #include <linux/kernel.h> |