linux-uconsole/include/linux/mfd
黄涛 1bcabbad76 Revert "temp revert rk change"
This reverts commit 15f7fabcb8.

Conflicts:

	.gitignore
	arch/arm/boot/compressed/head.S
	arch/arm/common/gic.c
	arch/arm/kernel/Makefile
	arch/arm/mm/proc-v7.S
	arch/arm/tools/mach-types
	arch/arm/vfp/vfphw.S
	drivers/Kconfig
	drivers/Makefile
	drivers/char/Makefile
	drivers/cpufreq/cpufreq_ondemand.c
	drivers/gpio/gpiolib.c
	drivers/gpio/tps65910-gpio.c
	drivers/input/Makefile
	drivers/input/keyboard/Kconfig
	drivers/input/keyboard/Makefile
	drivers/input/touchscreen/Kconfig
	drivers/media/video/Makefile
	drivers/media/video/ov2640.c
	drivers/media/video/soc_camera.c
	drivers/media/video/uvc/uvc_v4l2.c
	drivers/media/video/v4l2-ioctl.c
	drivers/mfd/Kconfig
	drivers/mfd/Makefile
	drivers/mfd/wm831x-core.c
	drivers/mfd/wm831x-i2c.c
	drivers/mfd/wm831x-irq.c
	drivers/mfd/wm831x-spi.c
	drivers/mfd/wm8994-core.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/misc/pmem.c
	drivers/mmc/card/block.c
	drivers/mmc/core/core.c
	drivers/mmc/core/mmc.c
	drivers/mmc/core/sd.c
	drivers/mmc/core/sdio.c
	drivers/mmc/host/Makefile
	drivers/net/wireless/Kconfig
	drivers/net/wireless/Makefile
	drivers/net/wireless/bcm4329/bcmsdh_linux.c
	drivers/net/wireless/bcm4329/dhd.h
	drivers/net/wireless/bcm4329/dhd_linux.c
	drivers/net/wireless/bcm4329/wl_iw.c
	drivers/net/wireless/bcm4329/wl_iw.h
	drivers/power/wm831x_power.c
	drivers/regulator/Makefile
	drivers/regulator/core.c
	drivers/regulator/tps65910-regulator.c
	drivers/regulator/wm831x-dcdc.c
	drivers/regulator/wm831x-isink.c
	drivers/regulator/wm831x-ldo.c
	drivers/rtc/Kconfig
	drivers/rtc/Makefile
	drivers/serial/Kconfig
	drivers/serial/Makefile
	drivers/staging/Kconfig
	drivers/staging/Makefile
	drivers/usb/Makefile
	drivers/usb/gadget/Kconfig
	drivers/usb/gadget/android.c
	drivers/usb/gadget/f_mass_storage.c
	drivers/usb/serial/option.c
	drivers/video/backlight/wm831x_bl.c
	fs/fat/dir.c
	fs/fat/fatent.c
	fs/fat/inode.c
	fs/yaffs2/yaffs_fs.c
	fs/yaffs2/yaffs_mtdif2.c
	include/linux/i2c.h
	include/linux/mfd/wm831x/core.h
	include/linux/mfd/wm831x/pdata.h
	include/linux/mfd/wm8994/core.h
	include/linux/mfd/wm8994/pdata.h
	include/linux/regulator/consumer.h
	include/media/v4l2-chip-ident.h
	kernel/power/earlysuspend.c
	kernel/power/wakelock.c
	kernel/sys.c
	mm/page_alloc.c
	sound/soc/codecs/Kconfig
	sound/soc/codecs/Makefile
	sound/soc/codecs/wm8900.c
	sound/soc/codecs/wm8988.c
	sound/soc/codecs/wm8994.c
	sound/soc/codecs/wm8994.h
	sound/soc/codecs/wm_hubs.c
	sound/soc/soc-cache.c
2011-11-04 17:43:18 +08:00
..
ab8500 gpio: driver for 42 AB8500 GPIO pins 2011-03-28 08:47:17 +02:00
pcf50633
pm8xxx mfd: Add pm8xxx irq support 2011-05-26 19:45:28 +02:00
wm831x Revert "temp revert rk change" 2011-11-04 17:43:18 +08:00
wm8350 Revert "Merge commit 'v2.6.32.9' into android-2.6.32" 2011-07-30 22:24:29 +08:00
wm8994 Revert "temp revert rk change" 2011-11-04 17:43:18 +08:00
88pm860x.h mfd: Add rtc support to 88pm860x 2011-05-26 19:45:34 +02:00
ab8500.h gpio: driver for 42 AB8500 GPIO pins 2011-03-28 08:47:17 +02:00
abx500.h mfd: Provide ab8500-core enumerators for chip cuts 2011-05-26 19:45:42 +02:00
adp5520.h
asic3.h mfd: Fix ASIC3 SD Host Controller Configuration size 2011-05-26 19:45:51 +02:00
core.h mfd: Remove mfd_data 2011-05-26 19:45:16 +02:00
da903x.h
davinci_voicecodec.h
db5500-prcmu.h mfd: add DB5500 PRCMU driver 2011-05-24 22:19:37 +02:00
db8500-prcmu.h mfd: update DB8500 PRCMU driver 2011-05-24 22:18:57 +02:00
ds1wm.h w1: ds1wm: add a reset recovery parameter 2011-07-08 21:14:44 -07:00
ezx-pcap.h
htc-egpio.h
htc-pasic3.h
janz.h
max8925.h
max8997-private.h regulator: Remove MAX8997_REG_BUCK1DVS/MAX8997_REG_BUCK2DVS/MAX8997_REG_BUCK5DVS macros 2011-05-27 10:49:10 +01:00
max8997.h mfd: Add MAX8997/8966 IRQ control 2011-03-27 00:09:33 +01:00
max8998-private.h
max8998.h
mc13xxx.h mfd: mfd_cell is now implicitly available to mc13xxx drivers 2011-03-23 10:41:54 +01:00
mc13783.h
mc13892.h
mcp.h
rdc321x.h
stmpe.h
t7l66xb.h
tc3589x.h
tc6387xb.h
tc6393xb.h
ti_ssp.h
tmio.h mmc: tmio: runtime suspend the controller, where possible 2011-05-24 23:53:55 -04:00
tps6105x.h regulator: Add a subdriver for TI TPS6105x regulator portions v2 2011-03-23 10:42:09 +01:00
tps6507x.h
tps6586x.h revert android-tegra-2.6.36-honeycomb-mr1-9001adc to v2.6.36 2011-10-28 16:02:47 +08:00
tps65910.h TPS65911: Comparator: Add comparator driver 2011-05-27 10:49:29 +01:00
twl4030-codec.h mfd: Update twl4030-code maintainer e-mail address 2011-05-26 19:45:45 +02:00
ucb1x00.h
wl1273-core.h
wm8400-audio.h
wm8400-private.h
wm8400.h