Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux...

[firefly-linux-kernel-4.4.55.git] / arch / xtensa / kernel / platform.c

diff --git a/arch/xtensa/kernel/platform.c b/arch/xtensa/kernel/platform.c
index 2bd6c351f37c6dac1417c16380847f15d9110588..1cf008284dd2925599df108f776ccdfb2e10e222 100644 (file)
--- a/arch/xtensa/kernel/platform.c
+++ b/arch/xtensa/kernel/platform.c
@@ -29,7 +29,6 @@
  */
 
 _F(void, setup, (char** cmd), { });
-_F(void, init_irq, (void), { });
 _F(void, restart, (void), { while(1); });
 _F(void, halt, (void), { while(1); });
 _F(void, power_off, (void), { while(1); });
@@ -42,6 +41,6 @@ _F(void, pcibios_init, (void), { });
 _F(void, calibrate_ccount, (void),
 {
        pr_err("ERROR: Cannot calibrate cpu frequency! Assuming 10MHz.\n");
-       ccount_per_jiffy = 10 * (1000000UL/HZ);
+       ccount_freq = 10 * 1000000UL;
 });
 #endif