diff options
author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-04-26 06:14:47 (GMT) |
---|---|---|
committer | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2013-04-26 06:14:47 (GMT) |
commit | 9bf9d47a29afbf7a43eae74a988a4aefe88ccbfd (patch) | |
tree | 966b838e2190a7d6868cda5f4eee6d0f490da27c /include/scsi | |
parent | e45f265e7ea3ee6de24efe91fe2928d603cb1741 (diff) | |
parent | 138f296e140f79cb955caba70690076fb14e6f6d (diff) | |
download | linux-fsl-qoriq-9bf9d47a29afbf7a43eae74a988a4aefe88ccbfd.tar.xz |
Merge branch '3.10/fb-mmap' into for-next
Merge topic branch to get vm_iomap_memory into use.
Conflicts:
drivers/video/fbmon.c
Diffstat (limited to 'include/scsi')
-rw-r--r-- | include/scsi/libfc.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/scsi/libfc.h b/include/scsi/libfc.h index 399162b..e1379b4 100644 --- a/include/scsi/libfc.h +++ b/include/scsi/libfc.h @@ -1074,7 +1074,8 @@ void fc_rport_terminate_io(struct fc_rport *); /* * DISCOVERY LAYER *****************************/ -int fc_disc_init(struct fc_lport *); +void fc_disc_init(struct fc_lport *); +void fc_disc_config(struct fc_lport *, void *); static inline struct fc_lport *fc_disc_lport(struct fc_disc *disc) { |