git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
[pandora-kernel.git]
/
arch
/
mn10300
/
include
/
asm
/
rtc.h
diff --git
a/arch/mn10300/include/asm/rtc.h
b/arch/mn10300/include/asm/rtc.h
index
c295194
..
6c14bb1
100644
(file)
--- a/
arch/mn10300/include/asm/rtc.h
+++ b/
arch/mn10300/include/asm/rtc.h
@@
-15,25
+15,14
@@
#include <linux/init.h>
#include <linux/init.h>
-extern void check_rtc_time(void);
extern void __init calibrate_clock(void);
extern void __init calibrate_clock(void);
-extern unsigned long __init get_initial_rtc_time(void);
#else /* !CONFIG_MN10300_RTC */
#else /* !CONFIG_MN10300_RTC */
-static inline void check_rtc_time(void)
-{
-}
-
static inline void calibrate_clock(void)
{
}
static inline void calibrate_clock(void)
{
}
-static inline unsigned long get_initial_rtc_time(void)
-{
- return 0;
-}
-
#endif /* !CONFIG_MN10300_RTC */
#include <asm-generic/rtc.h>
#endif /* !CONFIG_MN10300_RTC */
#include <asm-generic/rtc.h>