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.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.h')
| -rw-r--r-- | drivers/scsi/megaraid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid.h b/drivers/scsi/megaraid.h index 512c2cc1a33f..d310f49d077e 100644 --- a/drivers/scsi/megaraid.h +++ b/drivers/scsi/megaraid.h | |||
| @@ -381,7 +381,7 @@ typedef struct { | |||
| 381 | u8 battery_status; /* | 381 | u8 battery_status; /* |
| 382 | * BIT 0: battery module missing | 382 | * BIT 0: battery module missing |
| 383 | * BIT 1: VBAD | 383 | * BIT 1: VBAD |
| 384 | * BIT 2: temprature high | 384 | * BIT 2: temperature high |
| 385 | * BIT 3: battery pack missing | 385 | * BIT 3: battery pack missing |
| 386 | * BIT 4,5: | 386 | * BIT 4,5: |
| 387 | * 00 - charge complete | 387 | * 00 - charge complete |