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/megaraid/mbox_defs.h | |
parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/scsi/megaraid/mbox_defs.h')
-rw-r--r-- | drivers/scsi/megaraid/mbox_defs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid/mbox_defs.h b/drivers/scsi/megaraid/mbox_defs.h index b25b74764ec3..ce2487a888ed 100644 --- a/drivers/scsi/megaraid/mbox_defs.h +++ b/drivers/scsi/megaraid/mbox_defs.h | |||
@@ -497,7 +497,7 @@ typedef struct { | |||
497 | * @inserted_drive : channel:Id of inserted drive | 497 | * @inserted_drive : channel:Id of inserted drive |
498 | * @battery_status : bit 0: battery module missing | 498 | * @battery_status : bit 0: battery module missing |
499 | * bit 1: VBAD | 499 | * bit 1: VBAD |
500 | * bit 2: temprature high | 500 | * bit 2: temperature high |
501 | * bit 3: battery pack missing | 501 | * bit 3: battery pack missing |
502 | * bit 4,5: | 502 | * bit 4,5: |
503 | * 00 - charge complete | 503 | * 00 - charge complete |