mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
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: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
parent
34055b806a
commit
ebafc17468
3 changed files with 17 additions and 45 deletions
|
@ -1,5 +1,18 @@
|
|||
#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
|
||||
|
|
|
@ -1,18 +0,0 @@
|
|||
/*
|
||||
* 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
|
|
@ -1,23 +0,0 @@
|
|||
/*
|
||||
* 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
|
Loading…
Reference in a new issue