diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-08 02:22:41 -0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-08 02:22:41 -0400 |
| commit | 1a43f2012455a977397deffe35912fd3f3ce17b9 (patch) | |
| tree | 5189f337df44e7a495fbd097cd476b0380babd8c /arch/arm/mach-imx/mach-mx31ads.c | |
| parent | e1b96ada659431669efaf3defa997abf5db68130 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
Merge commit 'v3.1-rc1' into imx-fixes
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31ads.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31ads.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-mx31ads.c b/arch/arm/mach-imx/mach-mx31ads.c index 2ce3af8bce6d..29ca8907a780 100644 --- a/arch/arm/mach-imx/mach-mx31ads.c +++ b/arch/arm/mach-imx/mach-mx31ads.c | |||
| @@ -516,6 +516,8 @@ static void __init mx31ads_init_irq(void) | |||
| 516 | 516 | ||
| 517 | static void __init mx31ads_init(void) | 517 | static void __init mx31ads_init(void) |
| 518 | { | 518 | { |
| 519 | imx31_soc_init(); | ||
| 520 | |||
| 519 | mxc_init_extuart(); | 521 | mxc_init_extuart(); |
| 520 | mxc_init_imx_uart(); | 522 | mxc_init_imx_uart(); |
| 521 | mxc_init_i2c(); | 523 | mxc_init_i2c(); |