Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6: (73 commits)
  power: Revert "power_supply: Mark twl4030_charger as broken"
  mfd: Fix a memory leak when unload mc13xxx-core module
  mfd: Fix resource reclaim for max8998
  mfd: Remove unneeded ret value checking for max8998 register updates
  mfd: Add free max8998->ono irq in max8998_irq_exit()
  mfd: Fix resource reclaim in pcf50633_remove()
  omap4: pandaboard: fix up mmc card detect logic
  mfd: Fix ezx_pcap_probe error path
  mfd: Fix off-by-one value range checking for tps6507x
  mfd: Remove __devinitdata from tc6393xb_mmc_resources
  mfd: Add WM831x SPI support
  mfd: Factor out WM831x I2C I/O from the core driver
  mfd: Remove DEBUG defines from mc13xxx-core
  mfd: Fix jz4740_adc_set_enabled
  mfd: Add TPS658621C device ID
  mfd: Fix twl-irq function declaration warnings
  regulator: max8998 BUCK1/2 voltage change with use of GPIOs
  mfd: Voltages and GPIOs platform_data definitions for max8998
  regulator: max8998 BUCK1/2 internal voltages and indexes defined
  mfd: Support for ICs compliant with max8998
  ...

1 files changed, 8 insertions, 3 deletions

diff --git a/drivers/mfd/max8925-core.c b/drivers/mfd/max8925-core.c
index 428377a5a6f5..44695f5a1800 100644
--- a/drivers/mfd/max8925-core.c
+++ b/drivers/mfd/max8925-core.c
@@ -93,8 +93,13 @@ static struct mfd_cell rtc_devs[] = {
 static struct resource onkey_resources[] = {
         {
                 .name   = "max8925-onkey",
-                .start  = MAX8925_IRQ_GPM_SW_3SEC,
-                .end    = MAX8925_IRQ_GPM_SW_3SEC,
+                .start  = MAX8925_IRQ_GPM_SW_R,
+                .end    = MAX8925_IRQ_GPM_SW_R,
+                .flags  = IORESOURCE_IRQ,
+        }, {
+                .name   = "max8925-onkey",
+                .start  = MAX8925_IRQ_GPM_SW_F,
+                .end    = MAX8925_IRQ_GPM_SW_F,
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -102,7 +107,7 @@ static struct resource onkey_resources[] = {
 static struct mfd_cell onkey_devs[] = {
         {
                 .name           = "max8925-onkey",
-                .num_resources  = 1,
+                .num_resources  = 2,
                 .resources      = &onkey_resources[0],
                 .id             = -1,
         },