Commit 58e4b9de authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'mfd-fixes-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

Pull mfs fix from Lee Jones:
 "Unconstify editable placeholder structures"

* tag 'mfd-fixes-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
  mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources"
parents 43f0b562 a61f4661
...@@ -72,7 +72,8 @@ static const struct dmi_system_id dmi_platform_info[] = { ...@@ -72,7 +72,8 @@ static const struct dmi_system_id dmi_platform_info[] = {
{} {}
}; };
static const struct resource intel_quark_i2c_res[] = { /* This is used as a place holder and will be modified at run-time */
static struct resource intel_quark_i2c_res[] = {
[INTEL_QUARK_IORES_MEM] = { [INTEL_QUARK_IORES_MEM] = {
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
...@@ -85,7 +86,8 @@ static struct mfd_cell_acpi_match intel_quark_acpi_match_i2c = { ...@@ -85,7 +86,8 @@ static struct mfd_cell_acpi_match intel_quark_acpi_match_i2c = {
.adr = MFD_ACPI_MATCH_I2C, .adr = MFD_ACPI_MATCH_I2C,
}; };
static const struct resource intel_quark_gpio_res[] = { /* This is used as a place holder and will be modified at run-time */
static struct resource intel_quark_gpio_res[] = {
[INTEL_QUARK_IORES_MEM] = { [INTEL_QUARK_IORES_MEM] = {
.flags = IORESOURCE_MEM, .flags = IORESOURCE_MEM,
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment