diff options
| author | Robert Richter <robert.richter@amd.com> | 2008-09-24 05:25:31 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2008-09-24 05:25:31 -0400 |
| commit | f78e80209cf143be49f268c340431ae9fa3abb74 (patch) | |
| tree | 820fa64b688099dfdd93d27ba03252738ca5c7e2 /drivers/scsi/ips.c | |
| parent | 4c168eaf7ea39f25a45a3d8c7eebc3fedb633a1d (diff) | |
| parent | 24342c34a022ee90839873d91396045e12ef1090 (diff) | |
Merge commit 'v2.6.27-rc5' into tip/oprofile
Conflicts:
arch/x86/oprofile/nmi_int.c
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> |