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

Russell King · Russell King
2 parents 947ca2e983 1257629b07
Showing 2 changed files Side-by-side Diff
arch/arm/mach-pxa/devices.c
arch/arm/mach-pxa/imote2.c
@@ -72,7 +72,10 @@
 }
  
  
-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)
 {
@@ -412,7 +412,7 @@
  */
 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",
...	...	@@ -72,7 +72,10 @@
72	72	}
73	73
74	74
75		-static struct pxa2xx_udc_mach_info pxa_udc_info;
	75	+static struct pxa2xx_udc_mach_info pxa_udc_info = {
	76	+ .gpio_pullup = -1,
	77	+ .gpio_vbus = -1,
	78	+};
76	79
77	80	void __init pxa_set_udc_info(struct pxa2xx_udc_mach_info *info)
78	81	{
...	...	@@ -412,7 +412,7 @@
412	412	*/
413	413	static struct i2c_board_info __initdata imote2_i2c_board_info[] = {
414	414	{ /* UCAM sensor board */
415		- .type = "max1238",
	415	+ .type = "max1239",
416	416	.addr = 0x35,
417	417	}, { /* ITS400 Sensor board only */
418	418	.type = "max1363",