Commit 4024ce5e authored by Joe Korty's avatar Joe Korty Committed by Linus Torvalds

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent d2044a94
...@@ -11,8 +11,6 @@ ...@@ -11,8 +11,6 @@
#ifndef _LINUX_RTC_H_ #ifndef _LINUX_RTC_H_
#define _LINUX_RTC_H_ #define _LINUX_RTC_H_
#include <linux/interrupt.h>
/* /*
* The struct used to pass data via the following ioctl. Similar to the * 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 * struct tm in <time.h>, but it needs to be here so that the kernel
...@@ -95,6 +93,8 @@ struct rtc_pll_info { ...@@ -95,6 +93,8 @@ struct rtc_pll_info {
#ifdef __KERNEL__ #ifdef __KERNEL__
#include <linux/interrupt.h>
typedef struct rtc_task { typedef struct rtc_task {
void (*func)(void *private_data); void (*func)(void *private_data);
void *private_data; void *private_data;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment