diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2024-06-12 11:31:42 -0400 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2024-06-12 11:31:42 -0400 |
| commit | 89aa02edaa30e4327ebc8fca9b80795bbfd4ce9b (patch) | |
| tree | 10c96a25b500be034e38db049a22f53881b0fb4d /include/linux/mfd/intel-m10-bmc.h | |
| parent | ec3ac2c8d941dad959dcdc760aa43bc45785d346 (diff) | |
| parent | 1ddaaa244021aba8496536a6627b4ad2bc0f936a (diff) | |
Merge drm/drm-next into drm-xe-next
Needed to get tracing cleanup and add mmio tracing series.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/linux/mfd/intel-m10-bmc.h')
| -rw-r--r-- | include/linux/mfd/intel-m10-bmc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mfd/intel-m10-bmc.h b/include/linux/mfd/intel-m10-bmc.h index ee66c9751003..988f1cd90032 100644 --- a/include/linux/mfd/intel-m10-bmc.h +++ b/include/linux/mfd/intel-m10-bmc.h @@ -205,6 +205,7 @@ struct m10bmc_csr_map { unsigned int pr_reh_addr; unsigned int pr_magic; unsigned int rsu_update_counter; + unsigned int staging_size; }; /** |