Merge branch 'linux-2.6'

2007-09-20 10:09:27 +10:00
parent 9e4859ef54 a88a8eff1e
commit 0ce49a3945
223 changed files with 45086 additions and 1680 deletions
--- a/include/asm-powerpc/time.h
+++ b/include/asm-powerpc/time.h
@@ -149,6 +149,11 @@ static inline u64 get_tb(void)
 }
 #endif /* !CONFIG_PPC64 */

+static inline u64 get_tb_or_rtc(void)
+{
+	return __USE_RTC() ? get_rtc() : get_tb();
+}
+
 static inline void set_tb(unsigned int upper, unsigned int lower)
 {
 	mtspr(SPRN_TBWL, 0);