diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:20:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-05-20 12:20:59 -0400 |
| commit | f39d01be4c59a61a08d0cb53f615e7016b85d339 (patch) | |
| tree | 6777590e3ff2ddf4df1d38444ba7d692cd463b7b /drivers/scsi | |
| parent | 54291263519ac2c9bdda68b23b02fef3808deed4 (diff) | |
| parent | 7db82437cfcac4bdfe79a6323eb554fdfa271623 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (44 commits)
vlynq: make whole Kconfig-menu dependant on architecture
add descriptive comment for TIF_MEMDIE task flag declaration.
EEPROM: max6875: Header file cleanup
EEPROM: 93cx6: Header file cleanup
EEPROM: Header file cleanup
agp: use NULL instead of 0 when pointer is needed
rtc-v3020: make bitfield unsigned
PCI: make bitfield unsigned
jbd2: use NULL instead of 0 when pointer is needed
cciss: fix shadows sparse warning
doc: inode uses a mutex instead of a semaphore.
uml: i386: Avoid redefinition of NR_syscalls
fix "seperate" typos in comments
cocbalt_lcdfb: correct sections
doc: Change urls for sparse
Powerpc: wii: Fix typo in comment
i2o: cleanup some exit paths
Documentation/: it's -> its where appropriate
UML: Fix compiler warning due to missing task_struct declaration
UML: add kernel.h include to signal.c
...
Diffstat (limited to 'drivers/scsi')
| -rw-r--r-- | drivers/scsi/bfa/include/defs/bfa_defs_cee.h | 2 | ||||
| -rw-r--r-- | drivers/scsi/bfa/include/defs/bfa_defs_status.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_cee.h b/drivers/scsi/bfa/include/defs/bfa_defs_cee.h index b0ac9ac15c5d..6eaf519eccdc 100644 --- a/drivers/scsi/bfa/include/defs/bfa_defs_cee.h +++ b/drivers/scsi/bfa/include/defs/bfa_defs_cee.h | |||
| @@ -50,7 +50,7 @@ struct bfa_cee_lldp_str_s { | |||
| 50 | }; | 50 | }; |
| 51 | 51 | ||
| 52 | 52 | ||
| 53 | /* LLDP paramters */ | 53 | /* LLDP parameters */ |
| 54 | struct bfa_cee_lldp_cfg_s { | 54 | struct bfa_cee_lldp_cfg_s { |
| 55 | struct bfa_cee_lldp_str_s chassis_id; | 55 | struct bfa_cee_lldp_str_s chassis_id; |
| 56 | struct bfa_cee_lldp_str_s port_id; | 56 | struct bfa_cee_lldp_str_s port_id; |
diff --git a/drivers/scsi/bfa/include/defs/bfa_defs_status.h b/drivers/scsi/bfa/include/defs/bfa_defs_status.h index 4374494bd566..ec78b4cb121a 100644 --- a/drivers/scsi/bfa/include/defs/bfa_defs_status.h +++ b/drivers/scsi/bfa/include/defs/bfa_defs_status.h | |||
| @@ -223,9 +223,9 @@ enum bfa_status { | |||
| 223 | BFA_STATUS_IM_PVID_NON_ZERO = 140, /* Port VLAN ID (PVID) is Set to | 223 | BFA_STATUS_IM_PVID_NON_ZERO = 140, /* Port VLAN ID (PVID) is Set to |
| 224 | * Non-Zero Value */ | 224 | * Non-Zero Value */ |
| 225 | BFA_STATUS_IM_INETCFG_LOCK_FAILED = 141, /* Acquiring Network | 225 | BFA_STATUS_IM_INETCFG_LOCK_FAILED = 141, /* Acquiring Network |
| 226 | * Subsytem Lock Failed.Please | 226 | * Subsystem Lock Failed.Please |
| 227 | * try after some time */ | 227 | * try after some time */ |
| 228 | BFA_STATUS_IM_GET_INETCFG_FAILED = 142, /* Acquiring Network Subsytem | 228 | BFA_STATUS_IM_GET_INETCFG_FAILED = 142, /* Acquiring Network Subsystem |
| 229 | * handle Failed. Please try | 229 | * handle Failed. Please try |
| 230 | * after some time */ | 230 | * after some time */ |
| 231 | BFA_STATUS_IM_NOT_BOUND = 143, /* IM driver is not active */ | 231 | BFA_STATUS_IM_NOT_BOUND = 143, /* IM driver is not active */ |