summaryrefslogtreecommitdiffstats
path: root/include/asm-x86/mc146818rtc.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-26 16:28:36 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-26 16:28:36 +0200
commit29308333fbe2cc61258c1c470f9403960428beb2 (patch)
tree5bfcfadf2dd2d98c2ad251c96d7ee43a6903819a /include/asm-x86/mc146818rtc.h
parentx86_64: fix ia32 AMD syscall audit fast-path (diff)
parentMerge branch 'linus' into x86/header-guards (diff)
downloadlinux-29308333fbe2cc61258c1c470f9403960428beb2.tar.xz
linux-29308333fbe2cc61258c1c470f9403960428beb2.zip
Merge branch 'x86/header-guards' into x86/core
Diffstat (limited to 'include/asm-x86/mc146818rtc.h')
-rw-r--r--include/asm-x86/mc146818rtc.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/mc146818rtc.h b/include/asm-x86/mc146818rtc.h
index daf1ccde77af..a995f33176cd 100644
--- a/include/asm-x86/mc146818rtc.h
+++ b/include/asm-x86/mc146818rtc.h
@@ -1,8 +1,8 @@
/*
* Machine dependent access functions for RTC registers.
*/
-#ifndef _ASM_MC146818RTC_H
-#define _ASM_MC146818RTC_H
+#ifndef ASM_X86__MC146818RTC_H
+#define ASM_X86__MC146818RTC_H
#include <asm/io.h>
#include <asm/system.h>
@@ -101,4 +101,4 @@ extern unsigned long mach_get_cmos_time(void);
#define RTC_IRQ 8
-#endif /* _ASM_MC146818RTC_H */
+#endif /* ASM_X86__MC146818RTC_H */