diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-12-21 04:50:56 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-12-21 04:50:56 -0500 |
| commit | 4cf73129cbe001b41be2f8b56f763fbf3acaa4ce (patch) | |
| tree | 2cdde82f48800ae1746775bab7e4f3c5f1fc3b88 /drivers/scsi/qla2xxx/qla_nx.h | |
| parent | 3e54f5b72b44a5b905dc56442b147b0ee0475a1d (diff) | |
| parent | 6abff3c78051e40130a1c653f874fb12b9d40254 (diff) | |
Merge remote-tracking branch 'pfdo/drm-fixes' into drm-core-next
-next reported a messy merge, so I've merged my upstream pull into
my -next tree.
Conflicts:
drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_nx.h')
| -rw-r--r-- | drivers/scsi/qla2xxx/qla_nx.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/qla2xxx/qla_nx.h b/drivers/scsi/qla2xxx/qla_nx.h index 57820c199bc2..57a226be339a 100644 --- a/drivers/scsi/qla2xxx/qla_nx.h +++ b/drivers/scsi/qla2xxx/qla_nx.h | |||
| @@ -1173,4 +1173,8 @@ struct qla82xx_md_entry_queue { | |||
| 1173 | 1173 | ||
| 1174 | static const int MD_MIU_TEST_AGT_RDDATA[] = { 0x410000A8, 0x410000AC, | 1174 | static const int MD_MIU_TEST_AGT_RDDATA[] = { 0x410000A8, 0x410000AC, |
| 1175 | 0x410000B8, 0x410000BC }; | 1175 | 0x410000B8, 0x410000BC }; |
| 1176 | |||
| 1177 | #define CRB_NIU_XG_PAUSE_CTL_P0 0x1 | ||
| 1178 | #define CRB_NIU_XG_PAUSE_CTL_P1 0x8 | ||
| 1179 | |||
| 1176 | #endif | 1180 | #endif |