mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 15:18:19 +00:00
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
This commit is contained in:
commit
55f08e1baa
2 changed files with 3 additions and 2 deletions
|
@ -721,7 +721,7 @@ config MFD_PM8XXX_IRQ
|
||||||
|
|
||||||
config MFD_TPS65910
|
config MFD_TPS65910
|
||||||
bool "TPS65910 Power Management chip"
|
bool "TPS65910 Power Management chip"
|
||||||
depends on I2C=y
|
depends on I2C=y && GPIOLIB
|
||||||
select MFD_CORE
|
select MFD_CORE
|
||||||
select GPIO_TPS65910
|
select GPIO_TPS65910
|
||||||
help
|
help
|
||||||
|
|
|
@ -2005,7 +2005,8 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = {
|
||||||
static struct mfd_cell db8500_prcmu_devs[] = {
|
static struct mfd_cell db8500_prcmu_devs[] = {
|
||||||
{
|
{
|
||||||
.name = "db8500-prcmu-regulators",
|
.name = "db8500-prcmu-regulators",
|
||||||
.mfd_data = &db8500_regulators,
|
.platform_data = &db8500_regulators,
|
||||||
|
.pdata_size = sizeof(db8500_regulators),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
.name = "cpufreq-u8500",
|
.name = "cpufreq-u8500",
|
||||||
|
|
Loading…
Reference in a new issue