diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/scsi/megaraid.h | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
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 |