diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-29 04:02:15 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-29 04:02:20 -0400 |
| commit | 9de09ace8d518141a4375e1d216ab64db4377799 (patch) | |
| tree | da8e7a77f4ea91eb3bb73fc6da72ecf8c99e1c16 /drivers/s390/scsi/zfcp_ext.h | |
| parent | 1beee96bae0daf7f491356777c3080cc436950f5 (diff) | |
| parent | 6d3f1e12f46a2f9a1bb7e7aa433df8dd31ce5647 (diff) | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up fixes and move base from -rc1 to -rc5.
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, 1 insertions, 1 deletions
diff --git a/drivers/s390/scsi/zfcp_ext.h b/drivers/s390/scsi/zfcp_ext.h index 36935bc0818f..629edec70405 100644 --- a/drivers/s390/scsi/zfcp_ext.h +++ b/drivers/s390/scsi/zfcp_ext.h | |||
| @@ -28,7 +28,7 @@ extern int zfcp_sg_setup_table(struct scatterlist *, int); | |||
| 28 | /* zfcp_ccw.c */ | 28 | /* zfcp_ccw.c */ |
| 29 | extern int zfcp_ccw_register(void); | 29 | extern int zfcp_ccw_register(void); |
| 30 | extern int zfcp_ccw_priv_sch(struct zfcp_adapter *); | 30 | extern int zfcp_ccw_priv_sch(struct zfcp_adapter *); |
| 31 | extern struct zfcp_adapter *zfcp_get_adapter_by_busid(char *); | 31 | extern struct ccw_driver zfcp_ccw_driver; |
| 32 | 32 | ||
| 33 | /* zfcp_cfdc.c */ | 33 | /* zfcp_cfdc.c */ |
| 34 | extern struct miscdevice zfcp_cfdc_misc; | 34 | extern struct miscdevice zfcp_cfdc_misc; |