Re: Linux v2.6.16

[Joe Korty <joe.korty@ccur.com>]

Git patch 52dfa9a64cfb3dd01fa1ee1150d589481e54e28e

	[PATCH] move rtc_interrupt() prototype to rtc.h

broke strace(1) builds.  The below moves the kernel-only additions lower,
under the already provided #ifdef __KERNEL__ statement.


 2.6.16-jak/include/linux/rtc.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puNa include/linux/rtc.h~patch include/linux/rtc.h
--- 2.6.16/include/linux/rtc.h~patch	2006-03-20 12:07:07.000000000 -0500
+++ 2.6.16-jak/include/linux/rtc.h	2006-03-20 12:07:07.000000000 -0500
@@ -11,8 +11,6 @@
 #ifndef _LINUX_RTC_H_
 #define _LINUX_RTC_H_
 
-#include <linux/interrupt.h>
-
 /*
  * The struct used to pass data via the following ioctl. Similar to the
  * struct tm in <time.h>, but it needs to be here so that the kernel 
@@ -95,6 +93,8 @@ struct rtc_pll_info {
 
 #ifdef __KERNEL__
 
+#include <linux/interrupt.h>
+
 typedef struct rtc_task {
 	void (*func)(void *private_data);
 	void *private_data;

_