diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2011-09-26 14:12:45 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2011-09-26 14:12:45 -0400 |
| commit | 0d41da2e31e81f5c8aaabe17f769de4304b2d4c8 (patch) | |
| tree | 540acefba9bf01d3880d7bacb767fbf9b1fe80b4 /drivers/scsi/isci/unsolicited_frame_control.h | |
| parent | a0089bd617adea27ebc352e1e0871649ab1dbaa6 (diff) | |
| parent | e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6 (diff) | |
Merge branch 'pm-fixes' into pm-domains
Merge commit e8b364b88cc4001b21c28c1ecf1e1e3ffbe162e6
(PM / Clocks: Do not acquire a mutex under a spinlock) fixing
a regression in drivers/base/power/clock_ops.c.
Conflicts:
drivers/base/power/clock_ops.c
Diffstat (limited to 'drivers/scsi/isci/unsolicited_frame_control.h')
| -rw-r--r-- | drivers/scsi/isci/unsolicited_frame_control.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/isci/unsolicited_frame_control.h b/drivers/scsi/isci/unsolicited_frame_control.h index 31cb9506f52d..75d896686f5a 100644 --- a/drivers/scsi/isci/unsolicited_frame_control.h +++ b/drivers/scsi/isci/unsolicited_frame_control.h | |||
| @@ -214,7 +214,7 @@ struct sci_uf_address_table_array { | |||
| 214 | * starting address of the UF address table. | 214 | * starting address of the UF address table. |
| 215 | * 64-bit pointers are required by the hardware. | 215 | * 64-bit pointers are required by the hardware. |
| 216 | */ | 216 | */ |
| 217 | dma_addr_t *array; | 217 | u64 *array; |
| 218 | 218 | ||
| 219 | /** | 219 | /** |
| 220 | * This field specifies the physical address location for the UF | 220 | * This field specifies the physical address location for the UF |