Merge git://git.infradead.org/battery-2.6

[pandora-kernel.git] / include / linux / smp.h

diff --git a/include/linux/smp.h b/include/linux/smp.h
index a69db82..9e3d8af 100644 (file)
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -177,7 +177,6 @@ static inline void init_call_single_data(void)
 
 #define get_cpu()              ({ preempt_disable(); smp_processor_id(); })
 #define put_cpu()              preempt_enable()
-#define put_cpu_no_resched()   preempt_enable_no_resched()
 
 /*
  * Callback to arch code if there's nosmp or maxcpus=0 on the