diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 12:33:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 12:33:51 -0700 |
| commit | 55f08e1baa3ef11c952b626dbc7ef9e3e8332a63 (patch) | |
| tree | 4eb5f0bf3fd8d26ead9bd92ed8c5214cecf348ea | |
| parent | d02bf062fbb5e714d84ecefd05106062b9a45159 (diff) | |
| parent | 66c500ff36d74c6669ad260deda4ce8125b55304 (diff) | |
| download | kernel_samsung_smdk4412-55f08e1baa3ef11c952b626dbc7ef9e3e8332a63.zip kernel_samsung_smdk4412-55f08e1baa3ef11c952b626dbc7ef9e3e8332a63.tar.gz kernel_samsung_smdk4412-55f08e1baa3ef11c952b626dbc7ef9e3e8332a63.tar.bz2 | |
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
| -rw-r--r-- | drivers/mfd/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/mfd/db8500-prcmu.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index b6c2677..0f09c05 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -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 diff --git a/drivers/mfd/db8500-prcmu.c b/drivers/mfd/db8500-prcmu.c index e637821..02a15d7 100644 --- a/drivers/mfd/db8500-prcmu.c +++ b/drivers/mfd/db8500-prcmu.c @@ -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", |