diff options
| author | Joe Korty <joe.korty@ccur.com> | 2006-03-22 00:07:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-22 07:53:55 -0800 |
| commit | 4024ce5e0f396447cc1e07fd65c2a1d056b066bb (patch) | |
| tree | 89d7c0f97e279ae64884aa47a02cae8f13f3f51e /include/linux | |
| parent | d2044a94e80b61f68ee7456f82d9b443e9ff6ac7 (diff) | |
| download | op-kernel-dev-4024ce5e0f396447cc1e07fd65c2a1d056b066bb.zip op-kernel-dev-4024ce5e0f396447cc1e07fd65c2a1d056b066bb.tar.gz | |
[PATCH] rtc.h broke strace(1) builds
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.
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/rtc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/rtc.h b/include/linux/rtc.h index 0b2ba67..b739ac1 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h @@ -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; |
