tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds 55f08e1b d02bf062

+3 -2
+1 -1
drivers/mfd/Kconfig
··· 721 721 722 722 config MFD_TPS65910 723 723 bool "TPS65910 Power Management chip" 724 - depends on I2C=y 724 + depends on I2C=y && GPIOLIB 725 725 select MFD_CORE 726 726 select GPIO_TPS65910 727 727 help
+2 -1
drivers/mfd/db8500-prcmu.c
··· 2005 2005 static struct mfd_cell db8500_prcmu_devs[] = { 2006 2006 { 2007 2007 .name = "db8500-prcmu-regulators", 2008 - .mfd_data = &db8500_regulators, 2008 + .platform_data = &db8500_regulators, 2009 + .pdata_size = sizeof(db8500_regulators), 2009 2010 }, 2010 2011 { 2011 2012 .name = "cpufreq-u8500",