m68k: use the mc146818rtc.h for non-mmu setups as well.
The mmu varient of mc146818rtc.h can be use on the non-mmu builds as well. Revert to the single mc146818rtc.h file. Signed-off-by: Greg Ungerer <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
parent
9a4048a211
commit
bf08d52518
|
@ -1,5 +1,26 @@
|
|||
#ifdef __uClinux__
|
||||
#include "mc146818rtc_no.h"
|
||||
#else
|
||||
#include "mc146818rtc_mm.h"
|
||||
#endif
|
||||
/*
|
||||
* Machine dependent access functions for RTC registers.
|
||||
*/
|
||||
#ifndef _ASM_MC146818RTC_H
|
||||
#define _ASM_MC146818RTC_H
|
||||
|
||||
|
||||
#ifdef CONFIG_ATARI
|
||||
/* RTC in Atari machines */
|
||||
|
||||
#include <asm/atarihw.h>
|
||||
|
||||
#define RTC_PORT(x) (TT_RTC_BAS + 2*(x))
|
||||
#define RTC_ALWAYS_BCD 0
|
||||
|
||||
#define CMOS_READ(addr) ({ \
|
||||
atari_outb_p((addr),RTC_PORT(0)); \
|
||||
atari_inb_p(RTC_PORT(1)); \
|
||||
})
|
||||
#define CMOS_WRITE(val, addr) ({ \
|
||||
atari_outb_p((addr),RTC_PORT(0)); \
|
||||
atari_outb_p((val),RTC_PORT(1)); \
|
||||
})
|
||||
#endif /* CONFIG_ATARI */
|
||||
|
||||
#endif /* _ASM_MC146818RTC_H */
|
||||
|
|
|
@ -1,26 +0,0 @@
|
|||
/*
|
||||
* Machine dependent access functions for RTC registers.
|
||||
*/
|
||||
#ifndef _ASM_MC146818RTC_H
|
||||
#define _ASM_MC146818RTC_H
|
||||
|
||||
|
||||
#ifdef CONFIG_ATARI
|
||||
/* RTC in Atari machines */
|
||||
|
||||
#include <asm/atarihw.h>
|
||||
|
||||
#define RTC_PORT(x) (TT_RTC_BAS + 2*(x))
|
||||
#define RTC_ALWAYS_BCD 0
|
||||
|
||||
#define CMOS_READ(addr) ({ \
|
||||
atari_outb_p((addr),RTC_PORT(0)); \
|
||||
atari_inb_p(RTC_PORT(1)); \
|
||||
})
|
||||
#define CMOS_WRITE(val, addr) ({ \
|
||||
atari_outb_p((addr),RTC_PORT(0)); \
|
||||
atari_outb_p((val),RTC_PORT(1)); \
|
||||
})
|
||||
#endif /* CONFIG_ATARI */
|
||||
|
||||
#endif /* _ASM_MC146818RTC_H */
|
|
@ -1,9 +0,0 @@
|
|||
/*
|
||||
* Machine dependent access functions for RTC registers.
|
||||
*/
|
||||
#ifndef _M68KNOMMU_MC146818RTC_H
|
||||
#define _M68KNOMMU_MC146818RTC_H
|
||||
|
||||
/* empty include file to satisfy the include in genrtc.c/ide-geometry.c */
|
||||
|
||||
#endif /* _M68KNOMMU_MC146818RTC_H */
|
Loading…
Reference in a new issue