diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 15:45:44 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-08-12 15:45:44 +0000 |
| commit | 143ed290f02496fb918789cf14949e4e8033d34d (patch) | |
| tree | 02a2f503d4b6fac4598f326b8fa7ad009055c8c2 /arch/arm/mach-imx/mach-mx31ads.c | |
| parent | ac9cf9ff4f4ffa355d0e93c2bd6d74961a16efad (diff) | |
| parent | d9c927833a42b4eaae4addd031f780f4530f7a2d (diff) | |
Merge branch 'imx-fixes-for-arnd' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
Diffstat (limited to 'arch/arm/mach-imx/mach-mx31ads.c')
| -rw-r--r-- | arch/arm/mach-imx/mach-mx31ads.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/mach-mx31ads.c b/arch/arm/mach-imx/mach-mx31ads.c index 0ce49478a479..29ca8907a780 100644 --- a/arch/arm/mach-imx/mach-mx31ads.c +++ b/arch/arm/mach-imx/mach-mx31ads.c @@ -468,7 +468,7 @@ static struct i2c_board_info __initdata mx31ads_i2c1_devices[] = { #endif }; -static void mxc_init_i2c(void) +static void __init mxc_init_i2c(void) { i2c_register_board_info(1, mx31ads_i2c1_devices, ARRAY_SIZE(mx31ads_i2c1_devices)); @@ -486,7 +486,7 @@ static unsigned int ssi_pins[] = { MX31_PIN_STXD5__STXD5, }; -static void mxc_init_audio(void) +static void __init mxc_init_audio(void) { imx31_add_imx_ssi(0, NULL); mxc_iomux_setup_multiple_pins(ssi_pins, ARRAY_SIZE(ssi_pins), "ssi"); |