Merge tag 'stable/for-linus-3.14-rc0-tag' of git://git.kernel.org/pub/scm/linux/kerne...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / max8925-core.c

diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
index f0cc40296d8ccc50fab35f0805023bdab6ebc54f..f3faf0c45dddf36d09d4b2d05641145a7ebe13f6 100644 (file)
--- a/drivers/mfd/max8925-core.c
+++ b/drivers/mfd/max8925-core.c
@@ -45,7 +45,7 @@ static struct resource touch_resources[] = {
        },
 };
 
-static struct mfd_cell touch_devs[] = {
+static const struct mfd_cell touch_devs[] = {
        {
                .name           = "max8925-touch",
                .num_resources  = 1,
@@ -63,7 +63,7 @@ static struct resource power_supply_resources[] = {
        },
 };
 
-static struct mfd_cell power_devs[] = {
+static const struct mfd_cell power_devs[] = {
        {
                .name           = "max8925-power",
                .num_resources  = 1,
@@ -81,7 +81,7 @@ static struct resource rtc_resources[] = {
        },
 };
 
-static struct mfd_cell rtc_devs[] = {
+static const struct mfd_cell rtc_devs[] = {
        {
                .name           = "max8925-rtc",
                .num_resources  = 1,
@@ -104,7 +104,7 @@ static struct resource onkey_resources[] = {
        },
 };
 
-static struct mfd_cell onkey_devs[] = {
+static const struct mfd_cell onkey_devs[] = {
        {
                .name           = "max8925-onkey",
                .num_resources  = 2,