diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:18:44 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-03-26 11:19:03 -0400 |
| commit | 7fd52392c56361a40f0c630a82b36b95ca31eac6 (patch) | |
| tree | 14091de24c6b28ea4cae9826f98aeedb7be091f5 /include/target/target_core_backend.h | |
| parent | b01c3a0010aabadf745f3e7fdb9cab682e0a28a2 (diff) | |
| parent | e22057c8599373e5caef0bc42bdb95d2a361ab0d (diff) | |
Merge branch 'linus' into perf/urgent
Merge reason: we need to fix a non-trivial merge conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/target/target_core_backend.h')
| -rw-r--r-- | include/target/target_core_backend.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/target/target_core_backend.h b/include/target/target_core_backend.h index e5e6ff98f0fa..8c9ff1b14396 100644 --- a/include/target/target_core_backend.h +++ b/include/target/target_core_backend.h | |||
| @@ -62,4 +62,6 @@ int transport_set_vpd_ident(struct t10_vpd *, unsigned char *); | |||
| 62 | void *transport_kmap_data_sg(struct se_cmd *); | 62 | void *transport_kmap_data_sg(struct se_cmd *); |
| 63 | void transport_kunmap_data_sg(struct se_cmd *); | 63 | void transport_kunmap_data_sg(struct se_cmd *); |
| 64 | 64 | ||
| 65 | void array_free(void *array, int n); | ||
| 66 | |||
| 65 | #endif /* TARGET_CORE_BACKEND_H */ | 67 | #endif /* TARGET_CORE_BACKEND_H */ |