diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-25 08:39:12 -0400 |
| commit | f58899bb0224741eb0409ada67ecafe90ba137ef (patch) | |
| tree | 78284f77021e830b32e77071dd2ef4e5ccdaa289 /drivers/scsi/dpt | |
| parent | a2bd7274b47124d2fc4dfdb8c0591f545ba749dd (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/scsi/dpt')
| -rw-r--r-- | drivers/scsi/dpt/dpti_i2o.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/dpt/dpti_i2o.h b/drivers/scsi/dpt/dpti_i2o.h index 19406cea6d6a..179ad77f6cc9 100644 --- a/drivers/scsi/dpt/dpti_i2o.h +++ b/drivers/scsi/dpt/dpti_i2o.h | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | 21 | ||
| 22 | #include <linux/i2o-dev.h> | 22 | #include <linux/i2o-dev.h> |
| 23 | 23 | ||
| 24 | #include <linux/version.h> | ||
| 25 | #include <linux/notifier.h> | 24 | #include <linux/notifier.h> |
| 26 | #include <asm/atomic.h> | 25 | #include <asm/atomic.h> |
| 27 | 26 | ||