diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-27 01:37:05 -0500 |
| commit | 17f7f4d9fcce8f1b75b5f735569309dee7665968 (patch) | |
| tree | 14d7e49ca0053a0fcab3c33b5023bf3f90c5c08a /drivers/scsi/bfa/bfad_drv.h | |
| parent | 041110a439e21cd40709ead4ffbfa8034619ad77 (diff) | |
| parent | d7c1255a3a21e98bdc64df8ccf005a174d7e6289 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/ipv4/fib_frontend.c
Diffstat (limited to 'drivers/scsi/bfa/bfad_drv.h')
| -rw-r--r-- | drivers/scsi/bfa/bfad_drv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/bfa/bfad_drv.h b/drivers/scsi/bfa/bfad_drv.h index 97f9b6c0937e..d5ce2349ac59 100644 --- a/drivers/scsi/bfa/bfad_drv.h +++ b/drivers/scsi/bfa/bfad_drv.h | |||
| @@ -337,7 +337,7 @@ extern int num_sgpgs; | |||
| 337 | extern int rport_del_timeout; | 337 | extern int rport_del_timeout; |
| 338 | extern int bfa_lun_queue_depth; | 338 | extern int bfa_lun_queue_depth; |
| 339 | extern int bfa_io_max_sge; | 339 | extern int bfa_io_max_sge; |
| 340 | extern int log_level; | 340 | extern int bfa_log_level; |
| 341 | extern int ioc_auto_recover; | 341 | extern int ioc_auto_recover; |
| 342 | extern int bfa_linkup_delay; | 342 | extern int bfa_linkup_delay; |
| 343 | extern int msix_disable_cb; | 343 | extern int msix_disable_cb; |