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/ips.c | |
| parent | a2bd7274b47124d2fc4dfdb8c0591f545ba749dd (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/scsi/ips.c')
| -rw-r--r-- | drivers/scsi/ips.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 7c615c70ec5c..bc9e6ddf41df 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c | |||
| @@ -165,7 +165,6 @@ | |||
| 165 | #include <asm/byteorder.h> | 165 | #include <asm/byteorder.h> |
| 166 | #include <asm/page.h> | 166 | #include <asm/page.h> |
| 167 | #include <linux/stddef.h> | 167 | #include <linux/stddef.h> |
| 168 | #include <linux/version.h> | ||
| 169 | #include <linux/string.h> | 168 | #include <linux/string.h> |
| 170 | #include <linux/errno.h> | 169 | #include <linux/errno.h> |
| 171 | #include <linux/kernel.h> | 170 | #include <linux/kernel.h> |