Merge branch 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6

* 'for-next' of git://git.infradead.org/users/sameo/mfd-2.6: (80 commits)
  mfd: Fix missing abx500 header file updates
  mfd: Add missing <linux/io.h> include to intel_msic
  x86, mrst: add platform support for MSIC MFD driver
  mfd: Expose TurnOnStatus in ab8500 sysfs
  mfd: Remove support for early drop ab8500 chip
  mfd: Add support for ab8500 v3.3
  mfd: Add ab8500 interrupt disable hook
  mfd: Convert db8500-prcmu panic() into pr_crit()
  mfd: Refactor db8500-prcmu request_clock() function
  mfd: Rename db8500-prcmu init function
  mfd: Fix db5500-prcmu defines
  mfd: db8500-prcmu voltage domain consumers additions
  mfd: db8500-prcmu reset code retrieval
  mfd: db8500-prcmu tweak for modem wakeup
  mfd: Add db8500-pcmu watchdog accessor functions for watchdog
  mfd: hwacc power state db8500-prcmu accessor
  mfd: Add db8500-prcmu accessors for PLL and SGA clock
  mfd: Move to the new db500 PRCMU API
  mfd: Create a common interface for dbx500 PRCMU drivers
  mfd: Initialize DB8500 PRCMU regs
  ...

Fix up trivial conflicts in
	arch/arm/mach-imx/mach-mx31moboard.c
	arch/arm/mach-omap2/board-omap3beagle.c
	arch/arm/mach-u300/include/mach/irqs.h
	drivers/mfd/wm831x-spi.c

1 files changed, 17 insertions, 17 deletions

diff --git a/drivers/input/touchscreen/mc13783_ts.c b/drivers/input/touchscreen/mc13783_ts.c
index c5bc62d85bb6..ede02743eac1 100644
--- a/drivers/input/touchscreen/mc13783_ts.c
+++ b/drivers/input/touchscreen/mc13783_ts.c
@@ -35,7 +35,7 @@ MODULE_PARM_DESC(sample_tolerance,
 
 struct mc13783_ts_priv {
         struct input_dev *idev;
-        struct mc13783 *mc13783;
+        struct mc13xxx *mc13xxx;
         struct delayed_work work;
         struct workqueue_struct *workq;
         unsigned int sample[4];
@@ -45,7 +45,7 @@ static irqreturn_t mc13783_ts_handler(int irq, void *data)
 {
         struct mc13783_ts_priv *priv = data;
 
-        mc13783_irq_ack(priv->mc13783, irq);
+        mc13xxx_irq_ack(priv->mc13xxx, irq);
 
         /*
          * Kick off reading coordinates. Note that if work happens already
@@ -121,10 +121,10 @@ static void mc13783_ts_work(struct work_struct *work)
 {
         struct mc13783_ts_priv *priv =
                 container_of(work, struct mc13783_ts_priv, work.work);
-        unsigned int mode = MC13783_ADC_MODE_TS;
+        unsigned int mode = MC13XXX_ADC_MODE_TS;
         unsigned int channel = 12;
 
-        if (mc13783_adc_do_conversion(priv->mc13783,
+        if (mc13xxx_adc_do_conversion(priv->mc13xxx,
                                 mode, channel, priv->sample) == 0)
                 mc13783_ts_report_sample(priv);
 }
@@ -134,21 +134,21 @@ static int mc13783_ts_open(struct input_dev *dev)
         struct mc13783_ts_priv *priv = input_get_drvdata(dev);
         int ret;
 
-        mc13783_lock(priv->mc13783);
+        mc13xxx_lock(priv->mc13xxx);
 
-        mc13783_irq_ack(priv->mc13783, MC13783_IRQ_TS);
+        mc13xxx_irq_ack(priv->mc13xxx, MC13XXX_IRQ_TS);
 
-        ret = mc13783_irq_request(priv->mc13783, MC13783_IRQ_TS,
+        ret = mc13xxx_irq_request(priv->mc13xxx, MC13XXX_IRQ_TS,
                 mc13783_ts_handler, MC13783_TS_NAME, priv);
         if (ret)
                 goto out;
 
-        ret = mc13783_reg_rmw(priv->mc13783, MC13783_ADC0,
-                        MC13783_ADC0_TSMOD_MASK, MC13783_ADC0_TSMOD0);
+        ret = mc13xxx_reg_rmw(priv->mc13xxx, MC13XXX_ADC0,
+                        MC13XXX_ADC0_TSMOD_MASK, MC13XXX_ADC0_TSMOD0);
         if (ret)
-                mc13783_irq_free(priv->mc13783, MC13783_IRQ_TS, priv);
+                mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TS, priv);
 out:
-        mc13783_unlock(priv->mc13783);
+        mc13xxx_unlock(priv->mc13xxx);
         return ret;
 }
 
@@ -156,11 +156,11 @@ static void mc13783_ts_close(struct input_dev *dev)
 {
         struct mc13783_ts_priv *priv = input_get_drvdata(dev);
 
-        mc13783_lock(priv->mc13783);
-        mc13783_reg_rmw(priv->mc13783, MC13783_ADC0,
-                        MC13783_ADC0_TSMOD_MASK, 0);
-        mc13783_irq_free(priv->mc13783, MC13783_IRQ_TS, priv);
-        mc13783_unlock(priv->mc13783);
+        mc13xxx_lock(priv->mc13xxx);
+        mc13xxx_reg_rmw(priv->mc13xxx, MC13XXX_ADC0,
+                        MC13XXX_ADC0_TSMOD_MASK, 0);
+        mc13xxx_irq_free(priv->mc13xxx, MC13XXX_IRQ_TS, priv);
+        mc13xxx_unlock(priv->mc13xxx);
 
         cancel_delayed_work_sync(&priv->work);
 }
@@ -177,7 +177,7 @@ static int __init mc13783_ts_probe(struct platform_device *pdev)
                 goto err_free_mem;
 
         INIT_DELAYED_WORK(&priv->work, mc13783_ts_work);
-        priv->mc13783 = dev_get_drvdata(pdev->dev.parent);
+        priv->mc13xxx = dev_get_drvdata(pdev->dev.parent);
         priv->idev = idev;
 
         /*