aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.osdl.org>2006-11-21 18:42:44 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-11-21 18:42:44 -0800
commit0f9005a6f7a82f4aacbd72f7b92322a8ca1c3f97 (patch)
tree8b63f4a8add7f1bfbba02f9ddbbe26e7943afb21 /include
parentc5dd27337a70b34cc400120e70a80fcb84c4fd7a (diff)
parent8746ed3dae14e87e9f7ad8e44649b72e22b33274 (diff)
downloadkernel_samsung_smdk4412-0f9005a6f7a82f4aacbd72f7b92322a8ca1c3f97.zip
kernel_samsung_smdk4412-0f9005a6f7a82f4aacbd72f7b92322a8ca1c3f97.tar.gz
kernel_samsung_smdk4412-0f9005a6f7a82f4aacbd72f7b92322a8ca1c3f97.tar.bz2
Merge branch 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix ucc_geth of_device discovery on mpc832x [POWERPC] Revert "[POWERPC] Add powerpc get/set_rtc_time interface to new generic rtc class" [POWERPC] Revert "[POWERPC] Enable generic rtc hook for the MPC8349 mITX"
Diffstat (limited to 'include')
-rw-r--r--include/asm-powerpc/time.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h
index a782850..4cff977 100644
--- a/include/asm-powerpc/time.h
+++ b/include/asm-powerpc/time.h
@@ -39,10 +39,6 @@ extern void generic_calibrate_decr(void);
extern void wakeup_decrementer(void);
extern void snapshot_timebase(void);
-#ifdef CONFIG_RTC_CLASS
-extern int __init rtc_class_hookup(void);
-#endif
-
/* Some sane defaults: 125 MHz timebase, 1GHz processor */
extern unsigned long ppc_proc_freq;
#define DEFAULT_PROC_FREQ (DEFAULT_TB_FREQ * 8)