Skip to content

Commit

Permalink
Merge tag 'mfd-fixes-5.12' of git://git.kernel.org/pub/scm/linux/kern…
Browse files Browse the repository at this point in the history
…el/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"
  • Loading branch information
Linus Torvalds committed Mar 25, 2021
2 parents 43f0b56 + a61f466 commit 58e4b9d
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/mfd/intel_quark_i2c_gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -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] = {
.flags = IORESOURCE_MEM,
},
Expand All @@ -85,7 +86,8 @@ static struct mfd_cell_acpi_match intel_quark_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] = {
.flags = IORESOURCE_MEM,
},
Expand Down

0 comments on commit 58e4b9d

Please sign in to comment.