Merge commit master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 of HEAD

[linux-2.6-omap-h63xx.git] / include / asm-powerpc / time.h

diff --git a/include/asm-powerpc/time.h b/include/asm-powerpc/time.h
index 912118db13ae7d183a41a46b2236edc4d1bc08a2..dcde4410348d2da87c890c6cb9fe8a2f30dcb69f 100644 (file)
--- a/include/asm-powerpc/time.h
+++ b/include/asm-powerpc/time.h
@@ -14,13 +14,13 @@
 #define __POWERPC_TIME_H
 
 #ifdef __KERNEL__
-#include <linux/config.h>
 #include <linux/types.h>
 #include <linux/percpu.h>
 
 #include <asm/processor.h>
-#ifdef CONFIG_PPC64
+#ifdef CONFIG_PPC_ISERIES
 #include <asm/paca.h>
+#include <asm/firmware.h>
 #include <asm/iseries/hv_call.h>
 #endif
 
@@ -178,7 +178,8 @@ static inline void set_dec(int val)
 #ifdef CONFIG_PPC_ISERIES
        int cur_dec;
 
-       if (get_lppaca()->shared_proc) {
+       if (firmware_has_feature(FW_FEATURE_ISERIES) &&
+                       get_lppaca()->shared_proc) {
                get_lppaca()->virtual_decr = val;
                cur_dec = get_dec();
                if (cur_dec > val)