Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f02a59c authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.37' of... 

Merge branch 'for-2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into for-2.6.37
parents e6929378 c776357e

arch/arm/mach-omap2/board-rx51-peripherals.c

+0 −4
Original line number Diff line number Diff line
@@ -710,10 +710,6 @@ static struct twl4030_platform_data rx51_twldata __initdata = { 
	.vio			= &rx51_vio,

};



static struct aic3x_pdata rx51_aic3x_data __initdata = {

	.gpio_reset		= 60,

};



static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata = {

	.id			= TPA6130A2,

	.power_gpio		= 98,