diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 05:38:13 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-11-21 05:38:13 -0500 |
commit | 851462444d421c223965b12b836bef63da61b57f (patch) | |
tree | 495baa14e638817941496c36e1443aed7dae0ea0 /drivers/target/iscsi/iscsi_target_erl2.h | |
parent | 5a6ea4af0907f995dc06df21a9c9ef764c7cd3bc (diff) | |
parent | 6924d99fcdf1a688538a3cdebd1f135c22eec191 (diff) |
Merge branch 'for-3.7' of git://git.infradead.org/users/dedekind/l2-mtd
Conflicts:
drivers/mtd/nand/nand_base.c
Diffstat (limited to 'drivers/target/iscsi/iscsi_target_erl2.h')
-rw-r--r-- | drivers/target/iscsi/iscsi_target_erl2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/target/iscsi/iscsi_target_erl2.h b/drivers/target/iscsi/iscsi_target_erl2.h index 22f8d24780a6..63f2501f3fe0 100644 --- a/drivers/target/iscsi/iscsi_target_erl2.h +++ b/drivers/target/iscsi/iscsi_target_erl2.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef ISCSI_TARGET_ERL2_H | 1 | #ifndef ISCSI_TARGET_ERL2_H |
2 | #define ISCSI_TARGET_ERL2_H | 2 | #define ISCSI_TARGET_ERL2_H |
3 | 3 | ||
4 | extern void iscsit_create_conn_recovery_datain_values(struct iscsi_cmd *, u32); | 4 | extern void iscsit_create_conn_recovery_datain_values(struct iscsi_cmd *, __be32); |
5 | extern void iscsit_create_conn_recovery_dataout_values(struct iscsi_cmd *); | 5 | extern void iscsit_create_conn_recovery_dataout_values(struct iscsi_cmd *); |
6 | extern struct iscsi_conn_recovery *iscsit_get_inactive_connection_recovery_entry( | 6 | extern struct iscsi_conn_recovery *iscsit_get_inactive_connection_recovery_entry( |
7 | struct iscsi_session *, u16); | 7 | struct iscsi_session *, u16); |