diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 09:11:13 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 09:11:13 +0100 |
commit | 36609469c8278554b046aa4cc9a5fa9ccea35306 (patch) | |
tree | f59185b71c8059941de79143f71178453599b8f1 /arch/sh/include/cpu-sh4/cpu/rtc.h | |
parent | b3acf29afda06c76774dc6df6246c37ae707836b (diff) | |
parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) |
Merge commit 'v2.6.28-rc3' into tracing/ftrace
Diffstat (limited to 'arch/sh/include/cpu-sh4/cpu/rtc.h')
-rw-r--r-- | arch/sh/include/cpu-sh4/cpu/rtc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/include/cpu-sh4/cpu/rtc.h b/arch/sh/include/cpu-sh4/cpu/rtc.h index 25b1e6adfe8..95e6fb76c24 100644 --- a/arch/sh/include/cpu-sh4/cpu/rtc.h +++ b/arch/sh/include/cpu-sh4/cpu/rtc.h @@ -1,7 +1,7 @@ #ifndef __ASM_SH_CPU_SH4_RTC_H #define __ASM_SH_CPU_SH4_RTC_H -#ifdef CONFIG_CPU_SUBTYPE_SH7723 +#if defined(CONFIG_CPU_SUBTYPE_SH7722) || defined(CONFIG_CPU_SUBTYPE_SH7723) #define rtc_reg_size sizeof(u16) #else #define rtc_reg_size sizeof(u32) |