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

754c0f9a · Russell King · Russell King · 947ca2e9 · 1257629b · 754c0f9a
Commit 754c0f9a authored Jun 04, 2009 by Russell King Committed by Russell King Jun 04, 2009
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

arch/arm/mach-pxa/devices.c arch/arm/mach-pxa/devices.c +4 -1

arch/arm/mach-pxa/imote2.c arch/arm/mach-pxa/imote2.c +1 -1

No files found.
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@ -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)
 {

--- a/arch/arm/mach-pxa/imote2.c
+++ b/arch/arm/mach-pxa/imote2.c
@@ -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",