diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-05 12:19:13 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-05 12:19:13 +1000 |
| commit | 3f340d8d9892f123a51138cd38128b046563f99f (patch) | |
| tree | 40e32ece731561239f0feba2ceec88ccf2b157e9 /drivers/mfd/da9150-core.c | |
| parent | aac7872910200e739341b3e7435385e5b93ab529 (diff) | |
| parent | f4ed1f14b7c9114b56837124344124f3ec41d4df (diff) | |
Merge remote-tracking branch 'mfd/for-mfd-next'
Diffstat (limited to 'drivers/mfd/da9150-core.c')
| -rw-r--r-- | drivers/mfd/da9150-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/da9150-core.c b/drivers/mfd/da9150-core.c index 5549817df32e..94b9bbd1a69b 100644 --- a/drivers/mfd/da9150-core.c +++ b/drivers/mfd/da9150-core.c @@ -164,7 +164,7 @@ void da9150_bulk_write(struct da9150 *da9150, u16 reg, int count, const u8 *buf) } EXPORT_SYMBOL_GPL(da9150_bulk_write); -static struct regmap_irq da9150_irqs[] = { +static const struct regmap_irq da9150_irqs[] = { [DA9150_IRQ_VBUS] = { .reg_offset = 0, .mask = DA9150_E_VBUS_MASK, @@ -251,7 +251,7 @@ static struct regmap_irq da9150_irqs[] = { }, }; -static struct regmap_irq_chip da9150_regmap_irq_chip = { +static const struct regmap_irq_chip da9150_regmap_irq_chip = { .name = "da9150_irq", .status_base = DA9150_EVENT_E, .mask_base = DA9150_IRQ_MASK_E, |