diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2013-10-20 21:10:56 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2013-10-20 21:10:56 -0400 |
commit | 6886530bab1e059a0fc5bab9813c739413d033bf (patch) | |
tree | c5ae8b0853b09909986c3f8fca6e30fab24653b3 /arch/arm/mach-socfpga/socfpga.c | |
parent | 4a10c2ac2f368583138b774ca41fac4207911983 (diff) | |
parent | 64cc69abbb32e17aa44d2c696eca65cb6f9364ca (diff) |
Merge remote-tracking branch 'shesselba/clk-of-init-v2_for-3.13' into imx/soc
Diffstat (limited to 'arch/arm/mach-socfpga/socfpga.c')
-rw-r--r-- | arch/arm/mach-socfpga/socfpga.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c index bfce9641e32f..dd0d49cdbe09 100644 --- a/arch/arm/mach-socfpga/socfpga.c +++ b/arch/arm/mach-socfpga/socfpga.c | |||
@@ -14,7 +14,6 @@ | |||
14 | * You should have received a copy of the GNU General Public License | 14 | * You should have received a copy of the GNU General Public License |
15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | */ | 16 | */ |
17 | #include <linux/clk-provider.h> | ||
18 | #include <linux/irqchip.h> | 17 | #include <linux/irqchip.h> |
19 | #include <linux/of_address.h> | 18 | #include <linux/of_address.h> |
20 | #include <linux/of_irq.h> | 19 | #include <linux/of_irq.h> |
@@ -107,7 +106,6 @@ static void __init socfpga_cyclone5_init(void) | |||
107 | { | 106 | { |
108 | l2x0_of_init(0, ~0UL); | 107 | l2x0_of_init(0, ~0UL); |
109 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | 108 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); |
110 | of_clk_init(NULL); | ||
111 | socfpga_init_clocks(); | 109 | socfpga_init_clocks(); |
112 | } | 110 | } |
113 | 111 | ||