Commit 55f08e1b 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:
  mfd: Fix build breakage caused by tps65910 gpio directory move
  mfd: Use mfd cell platform_data for db8500-prcmu cells platform bits
parents d02bf062 66c500ff

drivers/mfd/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ config MFD_PM8XXX_IRQ 


config MFD_TPS65910

	bool "TPS65910 Power Management chip"

	depends on I2C=y

	depends on I2C=y && GPIOLIB

	select MFD_CORE

	select GPIO_TPS65910

	help

drivers/mfd/db8500-prcmu.c

+2 −1
Original line number Diff line number Diff line
@@ -2005,7 +2005,8 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = { 
static struct mfd_cell db8500_prcmu_devs[] = {

	{

		.name = "db8500-prcmu-regulators",

		.mfd_data = &db8500_regulators,

		.platform_data = &db8500_regulators,

		.pdata_size = sizeof(db8500_regulators),

	},

	{

		.name = "cpufreq-u8500",