diff options
| author | Pedro Perez de Heredia <pedro.perez@digi.com> | 2012-01-21 16:56:41 +0100 |
|---|---|---|
| committer | Pedro Perez de Heredia <pedro.perez@digi.com> | 2012-01-21 16:56:41 +0100 |
| commit | e2fdab3ae4ed922595557218157d54d1ee125993 (patch) | |
| tree | 1366fffef573453da565ce9b3fb9036bca276f06 | |
| parent | c72ff423175269e33275a8e21af425178c0f0e45 (diff) | |
ccxmx51: minor code clean up
Signed-off-by: Pedro Perez de Heredia <pedro.perez@digi.com>
| -rw-r--r-- | arch/arm/mach-mx5/mx51_ccwmx51js.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mx5/mx51_ccwmx51js.c b/arch/arm/mach-mx5/mx51_ccwmx51js.c index aef93b4ec2bc..65bc16c0f434 100644 --- a/arch/arm/mach-mx5/mx51_ccwmx51js.c +++ b/arch/arm/mach-mx5/mx51_ccwmx51js.c @@ -401,13 +401,13 @@ static void __init mxc_board_init(void) mxc_register_device(&sdram_autogating_device, NULL); mxc_register_device(&mxc_dvfs_core_device, &dvfs_core_data); mxc_register_device(&mxc_dvfs_per_device, &dvfs_per_data); -#ifdef CONFIG_MXC_IIM +#if defined (CONFIG_MXC_IIM) || defined (CONFIG_MXC_IIM_MODULE) mxc_register_device(&mxc_iim_device, &iim_data); #endif mxc_register_device(&mxc_v4l2_device, NULL); mxc_register_device(&mxc_v4l2out_device, NULL); mxc_register_device(&gpu_device,&gpu_data); -#if defined (CONFIG_MXC_SECURITY_SCC2) +#if defined (CONFIG_MXC_SECURITY_SCC2) || defined(CONFIG_MXC_SECURITY_SCC2_MODULE) mxc_register_device(&mxcscc_device, NULL); #endif mxc_register_device(&mxc_pwm1_device, NULL); |