diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /include/asm-generic/rtc.h | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-generic/rtc.h')
| -rw-r--r-- | include/asm-generic/rtc.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-generic/rtc.h b/include/asm-generic/rtc.h index dd1bed860e64..be4af0029ac0 100644 --- a/include/asm-generic/rtc.h +++ b/include/asm-generic/rtc.h | |||
| @@ -12,8 +12,6 @@ | |||
| 12 | #ifndef __ASM_RTC_H__ | 12 | #ifndef __ASM_RTC_H__ |
| 13 | #define __ASM_RTC_H__ | 13 | #define __ASM_RTC_H__ |
| 14 | 14 | ||
| 15 | #ifdef __KERNEL__ | ||
| 16 | |||
| 17 | #include <linux/mc146818rtc.h> | 15 | #include <linux/mc146818rtc.h> |
| 18 | #include <linux/rtc.h> | 16 | #include <linux/rtc.h> |
| 19 | #include <linux/bcd.h> | 17 | #include <linux/bcd.h> |
| @@ -213,5 +211,4 @@ static inline int set_rtc_pll(struct rtc_pll_info *pll) | |||
| 213 | return -EINVAL; | 211 | return -EINVAL; |
| 214 | } | 212 | } |
| 215 | 213 | ||
| 216 | #endif /* __KERNEL__ */ | ||
| 217 | #endif /* __ASM_RTC_H__ */ | 214 | #endif /* __ASM_RTC_H__ */ |