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

Commit ebafc174 authored by Greg Ungerer's avatar Greg Ungerer
Browse files

m68k: use mmu timex.h for non-mmu setups as well 



The non-mmu timex.h can be cleaned up and ends up being identical
to the mmu timex.h, just just use that.

Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 34055b80

arch/m68k/include/asm/timex.h

+17 −4
Original line number Diff line number Diff line 
#ifdef __uClinux__

#include "timex_no.h"

#else

#include "timex_mm.h"

/*

 * linux/include/asm-m68k/timex.h

 *

 * m68k architecture timex specifications

 */

#ifndef _ASMm68k_TIMEX_H

#define _ASMm68k_TIMEX_H



#define CLOCK_TICK_RATE	1193180 /* Underlying HZ */



typedef unsigned long cycles_t;



static inline cycles_t get_cycles(void)

{

	return 0;

}



#endif

arch/m68k/include/asm/timex_mm.h

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
/*

 * linux/include/asm-m68k/timex.h

 *

 * m68k architecture timex specifications

 */

#ifndef _ASMm68k_TIMEX_H

#define _ASMm68k_TIMEX_H



#define CLOCK_TICK_RATE	1193180 /* Underlying HZ */



typedef unsigned long cycles_t;



static inline cycles_t get_cycles(void)

{

	return 0;

}



#endif

arch/m68k/include/asm/timex_no.h

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
/*

 * linux/include/asm-m68knommu/timex.h

 *

 * m68knommu architecture timex specifications

 */

#ifndef _ASM_M68KNOMMU_TIMEX_H

#define _ASM_M68KNOMMU_TIMEX_H



#ifdef CONFIG_COLDFIRE

#include <asm/coldfire.h>

#define CLOCK_TICK_RATE	MCF_CLK

#else

#define CLOCK_TICK_RATE	1193180 /* Underlying HZ */

#endif



typedef unsigned long cycles_t;



static inline cycles_t get_cycles(void)

{

	return 0;

}



#endif