| commit | 020bd9f1c766ca743556461a70a5b5d559b7e60c | [log] [tgz] |
|---|---|---|
| author | Brian Gerst <bgerst@didntduck.org> | Mon Oct 15 13:57:46 2007 +0200 |
| committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | Wed Oct 17 20:17:08 2007 +0200 |
| tree | 73833b4a886620c0ccfd79ffb3a98a04206eaeb3 | |
| parent | c65916fe3586521932fbd1b734f39744657f2f0d [diff] [blame] |
x86: trivial header merges Merge 32/64-bit headers that simply redirect to asm-generic [tglx: fixup Kbuild as well] Signed-off-by: Brian Gerst <bgerst@didntduck.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
diff --git a/include/asm-x86/rtc.h b/include/asm-x86/rtc.h index 1f0c98e..f71c3b0 100644 --- a/include/asm-x86/rtc.h +++ b/include/asm-x86/rtc.h
@@ -1,5 +1 @@ -#ifdef CONFIG_X86_32 -# include "rtc_32.h" -#else -# include "rtc_64.h" -#endif +#include <asm-generic/rtc.h>