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/scsi/atari_scsi.c | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'drivers/scsi/atari_scsi.c')
| -rw-r--r-- | drivers/scsi/atari_scsi.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/atari_scsi.c b/drivers/scsi/atari_scsi.c index dfb1bcfae82e..642de7b2b7a2 100644 --- a/drivers/scsi/atari_scsi.c +++ b/drivers/scsi/atari_scsi.c | |||
| @@ -86,7 +86,6 @@ | |||
| 86 | #include <linux/delay.h> | 86 | #include <linux/delay.h> |
| 87 | #include <linux/mm.h> | 87 | #include <linux/mm.h> |
| 88 | #include <linux/blkdev.h> | 88 | #include <linux/blkdev.h> |
| 89 | #include <linux/sched.h> | ||
| 90 | #include <linux/interrupt.h> | 89 | #include <linux/interrupt.h> |
| 91 | #include <linux/init.h> | 90 | #include <linux/init.h> |
| 92 | #include <linux/nvram.h> | 91 | #include <linux/nvram.h> |