lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Russell King
2009-06-04 17:02:58 +01:00
committed by Russell King
parent 947ca2e983 1257629b07
commit 754c0f9a95
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-pxa/devices.c
View File

@@ -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) void __init pxa_set_udc_info(struct pxa2xx_udc_mach_info *info)
{ {

2
arch/arm/mach-pxa/imote2.c
View File

@@ -412,7 +412,7 @@ static struct platform_device imote2_flash_device = {
*/ */
static struct i2c_board_info __initdata imote2_i2c_board_info[] = { static struct i2c_board_info __initdata imote2_i2c_board_info[] = {
{ /* UCAM sensor board */ { /* UCAM sensor board */
.type = "max1238", .type = "max1239",
.addr = 0x35, .addr = 0x35,
}, { /* ITS400 Sensor board only */ }, { /* ITS400 Sensor board only */
.type = "max1363", .type = "max1363",