diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 17:04:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 17:04:37 -0500 |
| commit | d72d6f1b5647258e83819b51f72fe37e2b7d7965 (patch) | |
| tree | d3a08af50624d9b3e2287367b7e9f5fcc93bdce5 /drivers/scsi/gdth.h | |
| parent | 33ddcbbfb1d9f1bf1259531ae0ba8400ea3c8ba1 (diff) | |
| parent | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/gdth.h')
| -rw-r--r-- | drivers/scsi/gdth.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/gdth.h b/drivers/scsi/gdth.h index c0f1e3411524..cc4882fb97ad 100644 --- a/drivers/scsi/gdth.h +++ b/drivers/scsi/gdth.h | |||
| @@ -944,9 +944,9 @@ typedef struct { | |||
| 944 | ulong dma32_cnt, dma64_cnt; /* statistics: DMA buffer */ | 944 | ulong dma32_cnt, dma64_cnt; /* statistics: DMA buffer */ |
| 945 | #endif | 945 | #endif |
| 946 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) | 946 | #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) |
| 947 | Scsi_Device *sdev; | 947 | struct scsi_device *sdev; |
| 948 | #else | 948 | #else |
| 949 | Scsi_Device sdev; | 949 | struct scsi_device sdev; |
| 950 | #endif | 950 | #endif |
| 951 | } gdth_ha_str; | 951 | } gdth_ha_str; |
| 952 | 952 | ||