diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-12-08 01:07:56 -0500 |
| commit | bef986502fa398b1785a3979b1aa17cd902d3527 (patch) | |
| tree | b59c1afe7b1dfcc001b86e54863f550d7ddc8c34 /drivers/s390/scsi/zfcp_def.h | |
| parent | 4bdbd2807deeccc0793d57fb5120d7a53f2c0b3c (diff) | |
| parent | c99767974ebd2a719d849fdeaaa1674456f5283f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/usb/input/hid.h
Diffstat (limited to 'drivers/s390/scsi/zfcp_def.h')
| -rw-r--r-- | drivers/s390/scsi/zfcp_def.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/s390/scsi/zfcp_def.h b/drivers/s390/scsi/zfcp_def.h index 74c0eac083e4..32933ed54b8a 100644 --- a/drivers/s390/scsi/zfcp_def.h +++ b/drivers/s390/scsi/zfcp_def.h | |||
| @@ -1032,9 +1032,9 @@ struct zfcp_data { | |||
| 1032 | wwn_t init_wwpn; | 1032 | wwn_t init_wwpn; |
| 1033 | fcp_lun_t init_fcp_lun; | 1033 | fcp_lun_t init_fcp_lun; |
| 1034 | char *driver_version; | 1034 | char *driver_version; |
| 1035 | kmem_cache_t *fsf_req_qtcb_cache; | 1035 | struct kmem_cache *fsf_req_qtcb_cache; |
| 1036 | kmem_cache_t *sr_buffer_cache; | 1036 | struct kmem_cache *sr_buffer_cache; |
| 1037 | kmem_cache_t *gid_pn_cache; | 1037 | struct kmem_cache *gid_pn_cache; |
| 1038 | }; | 1038 | }; |
| 1039 | 1039 | ||
| 1040 | /** | 1040 | /** |