diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:27 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:31 -0400 |
commit | 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch) | |
tree | 51c50bcb67a5039448ddfa1869d7948cab1217e9 /drivers/s390/scsi/zfcp_ext.h | |
parent | 19c1a6f5764d787113fa323ffb18be7991208f82 (diff) | |
parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) |
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base,
update it to .30-rc5 to refresh.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/s390/scsi/zfcp_ext.h')
-rw-r--r-- | drivers/s390/scsi/zfcp_ext.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h index f6399ca97bcb..2e31b536548c 100644 --- a/drivers/s390/scsi/zfcp_ext.h +++ b/drivers/s390/scsi/zfcp_ext.h | |||
@@ -106,6 +106,7 @@ extern void zfcp_fc_plogi_evaluate(struct zfcp_port *, struct fsf_plogi *); | |||
106 | extern void zfcp_test_link(struct zfcp_port *); | 106 | extern void zfcp_test_link(struct zfcp_port *); |
107 | extern void zfcp_fc_link_test_work(struct work_struct *); | 107 | extern void zfcp_fc_link_test_work(struct work_struct *); |
108 | extern void zfcp_fc_nameserver_init(struct zfcp_adapter *); | 108 | extern void zfcp_fc_nameserver_init(struct zfcp_adapter *); |
109 | extern void zfcp_fc_wka_port_force_offline(struct zfcp_wka_port *); | ||
109 | 110 | ||
110 | /* zfcp_fsf.c */ | 111 | /* zfcp_fsf.c */ |
111 | extern int zfcp_fsf_open_port(struct zfcp_erp_action *); | 112 | extern int zfcp_fsf_open_port(struct zfcp_erp_action *); |
@@ -158,6 +159,7 @@ extern void zfcp_scsi_rport_work(struct work_struct *); | |||
158 | extern void zfcp_scsi_schedule_rport_register(struct zfcp_port *); | 159 | extern void zfcp_scsi_schedule_rport_register(struct zfcp_port *); |
159 | extern void zfcp_scsi_schedule_rport_block(struct zfcp_port *); | 160 | extern void zfcp_scsi_schedule_rport_block(struct zfcp_port *); |
160 | extern void zfcp_scsi_schedule_rports_block(struct zfcp_adapter *); | 161 | extern void zfcp_scsi_schedule_rports_block(struct zfcp_adapter *); |
162 | extern void zfcp_scsi_scan(struct work_struct *); | ||
161 | 163 | ||
162 | /* zfcp_sysfs.c */ | 164 | /* zfcp_sysfs.c */ |
163 | extern struct attribute_group zfcp_sysfs_unit_attrs; | 165 | extern struct attribute_group zfcp_sysfs_unit_attrs; |