diff options
author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 21:11:43 +0100 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 21:11:43 +0100 |
commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /drivers/scsi/gvp11.c | |
parent | Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powe... (diff) | |
parent | Merge branch 'for-linus' of git://www.atmel.no/~hskinnemoen/linux/kernel/avr32 (diff) | |
download | linux-f630fe2817601314b2eb7ca5ddc23c7834646731.tar.xz linux-f630fe2817601314b2eb7ca5ddc23c7834646731.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/scsi/gvp11.c')
-rw-r--r-- | drivers/scsi/gvp11.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/gvp11.c b/drivers/scsi/gvp11.c index 2f6c1137a6e5..37741e9b5c3b 100644 --- a/drivers/scsi/gvp11.c +++ b/drivers/scsi/gvp11.c @@ -1,7 +1,6 @@ #include <linux/types.h> #include <linux/mm.h> #include <linux/blkdev.h> -#include <linux/sched.h> #include <linux/init.h> #include <linux/interrupt.h> |