summaryrefslogtreecommitdiffstats
path: root/include/asm-m32r/mc146818rtc.h
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-02-17 15:09:59 -0500
committerJeff Garzik <jeff@garzik.org>2007-02-17 15:09:59 -0500
commit48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (patch)
treeda3aa535c98cc0957851354ceb0fbff7482d7a9d /include/asm-m32r/mc146818rtc.h
parent1a1689344add3333d28d1b5495d8043a3877d01c (diff)
parent4409d28140d9a6e6e3f4f1fdaf7234c4b965d954 (diff)
Merge branch 'gfar' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into upstream
Diffstat (limited to 'include/asm-m32r/mc146818rtc.h')
-rw-r--r--include/asm-m32r/mc146818rtc.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-m32r/mc146818rtc.h b/include/asm-m32r/mc146818rtc.h
index 755601d053c..aa1b7bf84f5 100644
--- a/include/asm-m32r/mc146818rtc.h
+++ b/include/asm-m32r/mc146818rtc.h
@@ -7,7 +7,6 @@
#include <asm/io.h>
#ifndef RTC_PORT
-// #define RTC_PORT(x) (0x70 + (x))
#define RTC_PORT(x) ((x))
#define RTC_ALWAYS_BCD 1 /* RTC operates in binary mode */
#endif
@@ -26,7 +25,5 @@ outb_p((val),RTC_PORT(1)); \
})
#define RTC_IRQ 8
-#if 0
-#endif
#endif /* _ASM_MC146818RTC_H */