diff options
| author | David S. Miller <davem@davemloft.net> | 2012-08-31 15:14:10 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-31 15:14:18 -0400 |
| commit | c32f38619af6302da58835fb292b159bdd96d11f (patch) | |
| tree | a5bb4a9c51999557eaa919f27369c70811cd813c /drivers/target/tcm_fc/tcm_fc.h | |
| parent | 761743ebc92df72053e736fce953a5d2e90099d5 (diff) | |
| parent | 0dcd5052c8543ef999bcd252cee50b7ae8111e89 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge the 'net' tree to get the recent set of netfilter bug fixes in
order to assist with some merge hassles Pablo is going to have to deal
with for upcoming changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/target/tcm_fc/tcm_fc.h')
| -rw-r--r-- | drivers/target/tcm_fc/tcm_fc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/target/tcm_fc/tcm_fc.h b/drivers/target/tcm_fc/tcm_fc.h index c5eb3c33c3db..eea69358ced3 100644 --- a/drivers/target/tcm_fc/tcm_fc.h +++ b/drivers/target/tcm_fc/tcm_fc.h | |||
| @@ -131,6 +131,7 @@ extern struct list_head ft_lport_list; | |||
| 131 | extern struct mutex ft_lport_lock; | 131 | extern struct mutex ft_lport_lock; |
| 132 | extern struct fc4_prov ft_prov; | 132 | extern struct fc4_prov ft_prov; |
| 133 | extern struct target_fabric_configfs *ft_configfs; | 133 | extern struct target_fabric_configfs *ft_configfs; |
| 134 | extern unsigned int ft_debug_logging; | ||
| 134 | 135 | ||
| 135 | /* | 136 | /* |
| 136 | * Fabric methods. | 137 | * Fabric methods. |