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.h | |
| 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.h')
| -rw-r--r-- | drivers/scsi/ips.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h index e0657b6f009c..4e49fbcfe8af 100644 --- a/drivers/scsi/ips.h +++ b/drivers/scsi/ips.h | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | #ifndef _IPS_H_ | 50 | #ifndef _IPS_H_ |
| 51 | #define _IPS_H_ | 51 | #define _IPS_H_ |
| 52 | 52 | ||
| 53 | #include <linux/version.h> | ||
| 54 | #include <linux/nmi.h> | 53 | #include <linux/nmi.h> |
| 55 | #include <asm/uaccess.h> | 54 | #include <asm/uaccess.h> |
| 56 | #include <asm/io.h> | 55 | #include <asm/io.h> |