Merge v3.13-rc2 into staging-next

[firefly-linux-kernel-4.4.55.git] / drivers / staging / nvec / nvec.c

diff --git a/drivers/staging/nvec/nvec.c b/drivers/staging/nvec/nvec.c
index 49ea76b3435dcd19b9a9f8bbbfb561a92b0a53fe..bb152201e93d2292835571c838c01ebf58805ed1 100644 (file)
--- a/drivers/staging/nvec/nvec.c
+++ b/drivers/staging/nvec/nvec.c
@@ -83,7 +83,7 @@ enum nvec_sleep_subcmds {
 
 static struct nvec_chip *nvec_power_handle;
 
-static struct mfd_cell nvec_devices[] = {
+static const struct mfd_cell nvec_devices[] = {
        {
                .name = "nvec-kbd",
                .id = 1,