aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2014-04-19 01:04:03 -0400
committerShawn Guo <shawn.guo@freescale.com>2014-05-12 10:58:47 -0400
commit1e56f8945d17a3a55b7d4c4dd9debeda8e68af8e (patch)
treedef843994b930755c9374ec062b48fe49b6880f6
parent9dc34da67bd802b48a8d8a0304ba329d99cef56e (diff)
ARM: i.MX: Remove #ifdef CONFIG_OF
CONFIG_OF is always selected for i.MX. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
-rw-r--r--arch/arm/mach-imx/clk-imx27.c2
-rw-r--r--arch/arm/mach-imx/clk-imx31.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c
index d2da8908b268..0db0b4f0c415 100644
--- a/arch/arm/mach-imx/clk-imx27.c
+++ b/arch/arm/mach-imx/clk-imx27.c
@@ -296,7 +296,6 @@ int __init mx27_clocks_init(unsigned long fref)
296 return 0; 296 return 0;
297} 297}
298 298
299#ifdef CONFIG_OF
300int __init mx27_clocks_init_dt(void) 299int __init mx27_clocks_init_dt(void)
301{ 300{
302 struct device_node *np; 301 struct device_node *np;
@@ -312,4 +311,3 @@ int __init mx27_clocks_init_dt(void)
312 311
313 return mx27_clocks_init(fref); 312 return mx27_clocks_init(fref);
314} 313}
315#endif
diff --git a/arch/arm/mach-imx/clk-imx31.c b/arch/arm/mach-imx/clk-imx31.c
index b5b65f3efaf1..4a9de0835eb1 100644
--- a/arch/arm/mach-imx/clk-imx31.c
+++ b/arch/arm/mach-imx/clk-imx31.c
@@ -191,7 +191,6 @@ int __init mx31_clocks_init(unsigned long fref)
191 return 0; 191 return 0;
192} 192}
193 193
194#ifdef CONFIG_OF
195int __init mx31_clocks_init_dt(void) 194int __init mx31_clocks_init_dt(void)
196{ 195{
197 struct device_node *np; 196 struct device_node *np;
@@ -207,4 +206,3 @@ int __init mx31_clocks_init_dt(void)
207 206
208 return mx31_clocks_init(fref); 207 return mx31_clocks_init(fref);
209} 208}
210#endif