Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b551f9d authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Kill off the GENERIC_CALIBRATE_DELAY ifndef. 



Now that everyone is using the clock framework directly and we
unconditionally provide our own calibrate_delay() function, having it
wrapped in an ifndef is no longer useful. So, kill it off.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent ccdaeb4c

arch/sh/kernel/setup.c

+1 −3
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ static inline void __init reserve_crashkernel(void) 
{}

#endif



#ifndef CONFIG_GENERIC_CALIBRATE_DELAY

void __cpuinit calibrate_delay(void)

{

	struct clk *clk = clk_get(NULL, "cpu_clk");
@@ -201,7 +200,6 @@ void __cpuinit calibrate_delay(void) 
			 (loops_per_jiffy/(5000/HZ)) % 100,

			 loops_per_jiffy);

}

#endif



void __init __add_active_range(unsigned int nid, unsigned long start_pfn,

						unsigned long end_pfn)