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-mx31lilly.c | |
| parent | e1b96ada659431669efaf3defa997abf5db68130 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
Merge commit 'v3.1-rc1' into imx-fixes
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31lilly.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31lilly.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/mach-mx31lilly.c b/arch/arm/mach-imx/mach-mx31lilly.c index 4bf1debfe357..126913ad106a 100644 --- a/arch/arm/mach-imx/mach-mx31lilly.c +++ b/arch/arm/mach-imx/mach-mx31lilly.c | |||
| @@ -243,6 +243,8 @@ core_param(mx31lilly_baseboard, mx31lilly_baseboard, int, 0444); | |||
| 243 | 243 | ||
| 244 | static void __init mx31lilly_board_init(void) | 244 | static void __init mx31lilly_board_init(void) |
| 245 | { | 245 | { |
| 246 | imx31_soc_init(); | ||
| 247 | |||
| 246 | switch (mx31lilly_baseboard) { | 248 | switch (mx31lilly_baseboard) { |
| 247 | case MX31LILLY_NOBOARD: | 249 | case MX31LILLY_NOBOARD: |
| 248 | break; | 250 | break; |