Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76b8f82c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: (58 commits)
  mfd: Add twl6030 regulator subdevices
  regulator: Add support for twl6030 regulators
  rtc: Add twl6030 RTC support
  mfd: Add support for twl6030 irq framework
  mfd: Rename twl4030_ routines in twl-regulator.c
  mfd: Rename twl4030_ routines in rtc-twl.c
  mfd: Rename all twl4030_i2c*
  mfd: Rename twl4030* driver files to enable re-use
  mfd: Clarify twl4030 return value for read and write
  mfd: Add all twl4030 regulators to the twl4030 mfd driver
  mfd: Don't set mc13783 ADREFMODE for touch conversions
  mfd: Remove ezx-pcap defines for custom led gpio encoding
  mfd: Near complete mc13783 rewrite
  mfd: Remove build time warning for WM835x register default tables
  mfd: Force I2C to be built in when building WM831x
  mfd: Don't allow wm831x to be built as a module
  mfd: Fix incorrect error check for wm8350-core
  mfd: Fix twl4030 warning
  gpiolib: Implement gpio_to_irq() for wm831x
  mfd: Remove default selection of AB4500
  ...
parents af853e63 9da66539

arch/arm/mach-omap2/board-2430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/delay.h>

#include <linux/i2c/twl4030.h>

#include <linux/i2c/twl.h>

#include <linux/err.h>

#include <linux/clk.h>

#include <linux/io.h>

arch/arm/mach-omap2/board-3430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
#include <linux/input/matrix_keypad.h>

#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>

#include <linux/i2c/twl4030.h>

#include <linux/i2c/twl.h>

#include <linux/regulator/machine.h>

#include <linux/io.h>

#include <linux/gpio.h>

arch/arm/mach-omap2/board-ldp.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>

#include <linux/regulator/machine.h>

#include <linux/i2c/twl4030.h>

#include <linux/i2c/twl.h>

#include <linux/io.h>

#include <linux/smsc911x.h>

arch/arm/mach-omap2/board-omap3beagle.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <linux/mtd/nand.h>



#include <linux/regulator/machine.h>

#include <linux/i2c/twl4030.h>

#include <linux/i2c/twl.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>

arch/arm/mach-omap2/board-omap3pandora.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/ads7846.h>

#include <linux/regulator/machine.h>

#include <linux/i2c/twl4030.h>

#include <linux/i2c/twl.h>

#include <linux/leds.h>

#include <linux/input.h>

#include <linux/input/matrix_keypad.h>