diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-04 17:02:58 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-04 17:02:58 +0100 |
| commit | 754c0f9a95b685163cfa9ea3ba9bd48310f9b06f (patch) | |
| tree | 2375cb28346eda9d347635b862971521dcb17594 /arch | |
| parent | 947ca2e983c7f46b49dbfb5bf51d39941d39f000 (diff) | |
| parent | 1257629b0712a0a68a24c532a05a4cd23e3f7565 (diff) | |
| download | blackbird-obmc-linux-754c0f9a95b685163cfa9ea3ba9bd48310f9b06f.tar.gz blackbird-obmc-linux-754c0f9a95b685163cfa9ea3ba9bd48310f9b06f.zip | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-pxa/devices.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-pxa/imote2.c | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/mach-pxa/devices.c b/arch/arm/mach-pxa/devices.c index d245e59c51b1..29970f703f3c 100644 --- 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) { diff --git a/arch/arm/mach-pxa/imote2.c b/arch/arm/mach-pxa/imote2.c index 2121309b2474..2b27336c29f1 100644 --- 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", |
