diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:04:42 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 17:04:42 -0400 |
| commit | 79a94c3538bda6869d7bb150b5e02dd3a72314dd (patch) | |
| tree | 91ceaff680af17633f12d6feba4058fb70e620a5 /arch/arm/mach-mx3/mach-pcm043.c | |
| parent | f779b7dd3259ec138c7aba793f0602b20262af83 (diff) | |
| parent | f1de1613da54f754d5d2bbf79fcacbd5ed965537 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mx3/mach-pcm043.c')
| -rw-r--r-- | arch/arm/mach-mx3/mach-pcm043.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx3/mach-pcm043.c b/arch/arm/mach-mx3/mach-pcm043.c index e790a00cf99..a9397a4151e 100644 --- a/arch/arm/mach-mx3/mach-pcm043.c +++ b/arch/arm/mach-mx3/mach-pcm043.c | |||
| @@ -395,7 +395,7 @@ static void __init mxc_board_init(void) | |||
| 395 | mxc_register_device(&mxc_otg_udc_device, &otg_device_pdata); | 395 | mxc_register_device(&mxc_otg_udc_device, &otg_device_pdata); |
| 396 | 396 | ||
| 397 | imx35_add_flexcan1(NULL); | 397 | imx35_add_flexcan1(NULL); |
| 398 | imx35_add_esdhc0(NULL); | 398 | imx35_add_esdhc(0, NULL); |
| 399 | } | 399 | } |
| 400 | 400 | ||
| 401 | static void __init pcm043_timer_init(void) | 401 | static void __init pcm043_timer_init(void) |