diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/scsi/bfa/bfa_cee.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/scsi/bfa/bfa_cee.c')
| -rw-r--r-- | drivers/scsi/bfa/bfa_cee.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/bfa/bfa_cee.c b/drivers/scsi/bfa/bfa_cee.c index 7a959c34e789..2b917792c6bc 100644 --- a/drivers/scsi/bfa/bfa_cee.c +++ b/drivers/scsi/bfa/bfa_cee.c | |||
| @@ -228,7 +228,7 @@ bfa_cee_reset_stats_isr(struct bfa_cee_s *cee, bfa_status_t status) | |||
| 228 | u32 | 228 | u32 |
| 229 | bfa_cee_meminfo(void) | 229 | bfa_cee_meminfo(void) |
| 230 | { | 230 | { |
| 231 | return (bfa_cee_attr_meminfo() + bfa_cee_stats_meminfo()); | 231 | return bfa_cee_attr_meminfo() + bfa_cee_stats_meminfo(); |
| 232 | } | 232 | } |
| 233 | 233 | ||
| 234 | /** | 234 | /** |