OpenCloudOS-Kernel/include/linux/i2c
Linus Torvalds 0df0914d41 Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (258 commits)
  omap: zoom: host should not pull up wl1271's irq line
  arm: plat-omap: iommu: fix request_mem_region() error path
  OMAP2+: Common CPU DIE ID reading code reads wrong registers for OMAP4430
  omap4: mux: Remove duplicate mux modes
  omap: iovmm: don't check 'da' to set IOVMF_DA_FIXED flag
  omap: iovmm: disallow mapping NULL address when IOVMF_DA_ANON is set
  omap2+: mux: Fix compile when CONFIG_OMAP_MUX is not selected
  omap4: board-omap4panda: Initialise the serial pads
  omap3: board-3430sdp: Initialise the serial pads
  omap4: board-4430sdp: Initialise the serial pads
  omap2+: mux: Add macro for configuring static with omap_hwmod_mux_init
  omap2+: mux: Remove the use of IDLE flag
  omap2+: Add separate list for dynamic pads to mux
  perf: add OMAP support for the new power events
  OMAP4: Add IVA OPP enteries.
  OMAP4: Update Voltage Rail Values for MPU, IVA and CORE
  OMAP4: Enable 800 MHz and 1 GHz MPU-OPP
  OMAP3+: OPP: Replace voltage values with Macros
  OMAP3: wdtimer: Fix CORE idle transition
  Watchdog: omap_wdt: add fine grain runtime-pm
  ...

Fix up various conflicts in
 - arch/arm/mach-omap2/board-omap3evm.c
 - arch/arm/mach-omap2/clock3xxx_data.c
 - arch/arm/mach-omap2/usb-musb.c
 - arch/arm/plat-omap/include/plat/usb.h
 - drivers/usb/musb/musb_core.h
2011-03-17 19:28:15 -07:00
..
adp5588.h Input: adp5588-keys - unify common header defines 2010-11-03 10:44:20 -07:00
adp8860.h backlight: adp8860: add support for ADP8861 & ADP8863 2010-05-26 13:08:33 +01:00
apds990x.h drivers/misc: driver for APDS990X ALS and proximity sensors 2010-10-26 16:52:14 -07:00
at24.h memory_accessor: implement the new memory_accessor interface for I2C EEPROM 2009-04-02 19:04:50 -07:00
bh1770glc.h drivers/misc: driver for bh1770glc / sfh7770 ALS and proximity sensor 2010-10-26 16:52:14 -07:00
dm355evm_msp.h mfd: dm355evm msp430 driver 2009-01-04 12:17:43 +01:00
ds620.h hwmon: Support for Dallas Semiconductor DS620 2011-01-09 09:10:10 -08:00
lm8323.h Input: introduce lm8323 keypad driver 2009-05-15 20:13:25 -07:00
ltc4245.h hwmon: (ltc4245) Expose all GPIO pins as analog voltages 2010-08-14 21:08:49 +02:00
max732x.h gpio: add interrupt handling capability to max732x 2010-05-27 09:12:41 -07:00
max6639.h hwmon: Driver for Maxim MAX6639 2011-03-14 22:36:24 -07:00
mcs.h Input: mcs - Add MCS touchkey driver 2010-07-04 01:23:26 -07:00
pca953x.h gpiolib: make names array and its values const 2010-05-27 09:12:41 -07:00
pca954x.h i2c: I2C bus multiplexer driver pca954x 2010-08-11 18:21:03 +02:00
pcf857x.h
pmbus.h hwmon: PMBus device driver 2011-03-14 22:36:26 -07:00
qt602240_ts.h Input: Add ATMEL QT602240 touchscreen driver 2010-07-14 21:58:52 -07:00
s6000.h i2c: xtensa s6000 i2c driver 2009-04-07 10:23:34 +01:00
sx150x.h gpio: sx150x: correct and refine reset-on-probe behavior 2010-09-09 18:57:24 -07:00
tps65010.h mfd: Allow configuration of VDCDC2 for tps65010 2009-12-13 19:21:36 +01:00
tsc2007.h Input: add tsc2007 based touchscreen driver 2008-12-20 05:00:43 -05:00
twl.h Merge branch 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 2011-03-17 19:28:15 -07:00