lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] rtc.h broke strace(1) builds

Browse Source 
Git patch 52dfa9a64c

	[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>
This commit is contained in:
Joe Korty
2006-03-22 00:07:43 -08:00
committed by Linus Torvalds
parent d2044a94e8
commit 4024ce5e0f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/rtc.h
View File

@@ -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 {
#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;