Module: xenomai-2.6
Branch: master
Commit: ca75cd69cdaf5b19f5686b09591daf79998c47c0
URL:
http://git.xenomai.org/?p=xenomai-2.6.git;a=commit;h=ca75cd69cdaf5b19f5686b09591daf79998c47c0
Author: Philippe Gerum <r...@xenomai.org>
Date: Sat Aug 11 10:28:46 2012 +0200
hal/powerpc: fixup for kernel 3.4 series
---
include/asm-powerpc/atomic.h | 1 -
include/asm-powerpc/bits/timer.h | 2 +-
include/asm-powerpc/fptest.h | 1 -
include/asm-powerpc/hal.h | 1 -
ksrc/arch/powerpc/hal.c | 1 -
5 files changed, 1 insertions(+), 5 deletions(-)
diff --git a/include/asm-powerpc/atomic.h b/include/asm-powerpc/atomic.h
index 42c3d72..422adda 100644
--- a/include/asm-powerpc/atomic.h
+++ b/include/asm-powerpc/atomic.h
@@ -28,7 +28,6 @@
#include <linux/bitops.h>
#include <linux/version.h>
#include <asm/atomic.h>
-#include <asm/system.h>
#define xnarch_atomic_xchg(ptr,v) xchg(ptr,v)
#define xnarch_memory_barrier() smp_mb()
diff --git a/include/asm-powerpc/bits/timer.h b/include/asm-powerpc/bits/timer.h
index b73a514..ade0b73 100644
--- a/include/asm-powerpc/bits/timer.h
+++ b/include/asm-powerpc/bits/timer.h
@@ -40,7 +40,7 @@ static inline void xnarch_program_timer_shot(unsigned long
delay)
rthal_timer_program_shot(rthal_imuldiv_ceil
(delay, RTHAL_TIMER_FREQ, RTHAL_CLOCK_FREQ));
#else
- rthal_timer_program_shot(delay)
+ rthal_timer_program_shot(delay);
#endif
}
diff --git a/include/asm-powerpc/fptest.h b/include/asm-powerpc/fptest.h
index c8381d6..46b97e0 100644
--- a/include/asm-powerpc/fptest.h
+++ b/include/asm-powerpc/fptest.h
@@ -3,7 +3,6 @@
#ifdef __KERNEL__
#include <linux/module.h>
-#include <asm/system.h>
static inline int fp_kernel_supported(void)
{
diff --git a/include/asm-powerpc/hal.h b/include/asm-powerpc/hal.h
index aea960c..c5c5cc1 100644
--- a/include/asm-powerpc/hal.h
+++ b/include/asm-powerpc/hal.h
@@ -54,7 +54,6 @@ static inline __attribute_const__ unsigned long ffnz(unsigned
long ul)
#ifndef __cplusplus
#include <linux/irq.h>
-#include <asm/system.h>
#include <asm/time.h>
#include <asm/timex.h>
#include <asm/xenomai/atomic.h>
diff --git a/ksrc/arch/powerpc/hal.c b/ksrc/arch/powerpc/hal.c
index a3b2270..d82cd85 100644
--- a/ksrc/arch/powerpc/hal.c
+++ b/ksrc/arch/powerpc/hal.c
@@ -39,7 +39,6 @@
#include <linux/module.h>
#include <linux/irq.h>
#include <linux/console.h>
-#include <asm/system.h>
#include <asm/hardirq.h>
#include <asm/hw_irq.h>
#include <asm/irq.h>
_______________________________________________
Xenomai-git mailing list
Xenomai-git@xenomai.org
http://www.xenomai.org/mailman/listinfo/xenomai-git
