diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-06 10:15:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-06 10:15:57 -0400 |
| commit | b8cd9d056bbc5f2630ab1787dbf76f83bbb517c0 (patch) | |
| tree | a49c776b88db5346eaef6082c271f5d79319654f /include/asm-x86/mc146818rtc.h | |
| parent | fec6ed1d1f9b78a6acb4a3eb2c46c812ac2e96f0 (diff) | |
| parent | 1503af661947b7a4a09355cc2ae6aa0d43f16776 (diff) | |
Merge branch 'x86/header-guards' into x86-v28-for-linus-phase1
Conflicts:
include/asm-x86/dma-mapping.h
include/asm-x86/gpio.h
include/asm-x86/idle.h
include/asm-x86/kvm_host.h
include/asm-x86/namei.h
include/asm-x86/uaccess.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/mc146818rtc.h')
| -rw-r--r-- | include/asm-x86/mc146818rtc.h | 6 |
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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Machine dependent access functions for RTC registers. | 2 | * Machine dependent access functions for RTC registers. |
| 3 | */ | 3 | */ |
| 4 | #ifndef _ASM_MC146818RTC_H | 4 | #ifndef ASM_X86__MC146818RTC_H |
| 5 | #define _ASM_MC146818RTC_H | 5 | #define ASM_X86__MC146818RTC_H |
| 6 | 6 | ||
| 7 | #include <asm/io.h> | 7 | #include <asm/io.h> |
| 8 | #include <asm/system.h> | 8 | #include <asm/system.h> |
| @@ -101,4 +101,4 @@ extern unsigned long mach_get_cmos_time(void); | |||
| 101 | 101 | ||
| 102 | #define RTC_IRQ 8 | 102 | #define RTC_IRQ 8 |
| 103 | 103 | ||
| 104 | #endif /* _ASM_MC146818RTC_H */ | 104 | #endif /* ASM_X86__MC146818RTC_H */ |