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

Commit 754c0f9a authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6

parents 947ca2e9 1257629b

arch/arm/mach-pxa/devices.c

+4 −1
Original line number Diff line number Diff line
@@ -72,7 +72,10 @@ void __init pxa_set_mci_info(struct pxamci_platform_data *info) 
}





static struct pxa2xx_udc_mach_info pxa_udc_info;

static struct pxa2xx_udc_mach_info pxa_udc_info = {

	.gpio_pullup = -1,

	.gpio_vbus   = -1,

};



void __init pxa_set_udc_info(struct pxa2xx_udc_mach_info *info)

{

arch/arm/mach-pxa/imote2.c

+1 −1
Original line number Diff line number Diff line
@@ -412,7 +412,7 @@ static struct platform_device imote2_flash_device = { 
 */

static struct i2c_board_info __initdata imote2_i2c_board_info[] = {

	{ /* UCAM sensor board */

		.type = "max1238",

		.type = "max1239",

		.addr = 0x35,

	}, { /* ITS400 Sensor board only */

		.type = "max1363",