diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 15:47:02 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-07 15:47:02 -0500 |
commit | da40d036fd716f0efb2917076220814b1e927ae1 (patch) | |
tree | 567893573a48e2954d82421e77606034d3b32f84 /drivers/scsi/bfa/bfa_modules.h | |
parent | aa58abc20fa85328a9f048e2626c0893691ff284 (diff) | |
parent | c32e061fa19893ce4acf95d97d5613a161f0f1b7 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (147 commits)
[SCSI] arcmsr: fix write to device check
[SCSI] lpfc: lower stack use in lpfc_fc_frame_check
[SCSI] eliminate an unnecessary local variable from scsi_remove_target()
[SCSI] libiscsi: use bh locking instead of irq with session lock
[SCSI] libiscsi: do not take host lock in queuecommand
[SCSI] be2iscsi: fix null ptr when accessing task hdr
[SCSI] be2iscsi: fix gfp use in alloc_pdu
[SCSI] libiscsi: add more informative failure message during iscsi scsi eh
[SCSI] gdth: Add missing call to gdth_ioctl_free
[SCSI] bfa: remove unused defintions and misc cleanups
[SCSI] bfa: remove inactive functions
[SCSI] bfa: replace bfa_assert with WARN_ON
[SCSI] qla2xxx: Use sg_next to fetch next sg element while walking sg list.
[SCSI] qla2xxx: Fix to avoid recursive lock failure during BSG timeout.
[SCSI] qla2xxx: Remove code to not reset ISP82xx on failure.
[SCSI] qla2xxx: Display mailbox register 4 during 8012 AEN for ISP82XX parts.
[SCSI] qla2xxx: Don't perform a BIG_HAMMER if Get-ID (0x20) mailbox command fails on CNAs.
[SCSI] qla2xxx: Remove redundant module parameter permission bits
[SCSI] qla2xxx: Add sysfs node for displaying board temperature.
[SCSI] qla2xxx: Code cleanup to remove unwanted comments and code.
...
Diffstat (limited to 'drivers/scsi/bfa/bfa_modules.h')
-rw-r--r-- | drivers/scsi/bfa/bfa_modules.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/scsi/bfa/bfa_modules.h b/drivers/scsi/bfa/bfa_modules.h index 15407ab39e77..ab79ff6fdeea 100644 --- a/drivers/scsi/bfa/bfa_modules.h +++ b/drivers/scsi/bfa/bfa_modules.h | |||
@@ -99,7 +99,6 @@ struct bfa_module_s { | |||
99 | void (*iocdisable) (struct bfa_s *bfa); | 99 | void (*iocdisable) (struct bfa_s *bfa); |
100 | }; | 100 | }; |
101 | 101 | ||
102 | extern struct bfa_module_s *hal_mods[]; | ||
103 | 102 | ||
104 | struct bfa_s { | 103 | struct bfa_s { |
105 | void *bfad; /* BFA driver instance */ | 104 | void *bfad; /* BFA driver instance */ |
@@ -116,8 +115,6 @@ struct bfa_s { | |||
116 | struct bfa_msix_s msix; | 115 | struct bfa_msix_s msix; |
117 | }; | 116 | }; |
118 | 117 | ||
119 | extern bfa_isr_func_t bfa_isrs[BFI_MC_MAX]; | ||
120 | extern bfa_ioc_mbox_mcfunc_t bfa_mbox_isrs[]; | ||
121 | extern bfa_boolean_t bfa_auto_recover; | 118 | extern bfa_boolean_t bfa_auto_recover; |
122 | extern struct bfa_module_s hal_mod_sgpg; | 119 | extern struct bfa_module_s hal_mod_sgpg; |
123 | extern struct bfa_module_s hal_mod_fcport; | 120 | extern struct bfa_module_s hal_mod_fcport; |