aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2007-05-08 03:32:40 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 14:15:16 -0400
commita7e27d5dd396419dc6d6288db6a6d86cf3a94ba5 (patch)
treed724d785531a6c181b4b78c2fde96b122f07eff6
parent635244c59c27d3b22c4523d2a951cf553195a966 (diff)
sanitize linux/isdn_divertif.h for userspace
the isdn_divertif contains kernel-only references so I've wrapped them in __KERNEL__ and add proper #include statements. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Cc: Karsten Keil <kkeil@suse.de> Cc: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--include/linux/Kbuild2
-rw-r--r--include/linux/isdn_divertif.h5
2 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index ccc6fc157064..94cc04a143f2 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -92,7 +92,6 @@ header-y += ip_mp_alg.h
92header-y += ipsec.h 92header-y += ipsec.h
93header-y += ipx.h 93header-y += ipx.h
94header-y += irda.h 94header-y += irda.h
95header-y += isdn_divertif.h
96header-y += iso_fs.h 95header-y += iso_fs.h
97header-y += ixjuser.h 96header-y += ixjuser.h
98header-y += jffs2.h 97header-y += jffs2.h
@@ -242,6 +241,7 @@ unifdef-y += ipv6.h
242unifdef-y += ipv6_route.h 241unifdef-y += ipv6_route.h
243unifdef-y += isdn.h 242unifdef-y += isdn.h
244unifdef-y += isdnif.h 243unifdef-y += isdnif.h
244unifdef-y += isdn_divertif.h
245unifdef-y += isdn_ppp.h 245unifdef-y += isdn_ppp.h
246unifdef-y += isicom.h 246unifdef-y += isicom.h
247unifdef-y += jbd.h 247unifdef-y += jbd.h
diff --git a/include/linux/isdn_divertif.h b/include/linux/isdn_divertif.h
index 0e7e44ce8301..07821ca5955f 100644
--- a/include/linux/isdn_divertif.h
+++ b/include/linux/isdn_divertif.h
@@ -24,6 +24,10 @@
24#define DIVERT_REL_ERR 0x04 /* module not registered */ 24#define DIVERT_REL_ERR 0x04 /* module not registered */
25#define DIVERT_REG_NAME isdn_register_divert 25#define DIVERT_REG_NAME isdn_register_divert
26 26
27#ifdef __KERNEL__
28#include <linux/isdnif.h>
29#include <linux/types.h>
30
27/***************************************************************/ 31/***************************************************************/
28/* structure exchanging data between isdn hl and divert module */ 32/* structure exchanging data between isdn hl and divert module */
29/***************************************************************/ 33/***************************************************************/
@@ -40,3 +44,4 @@ typedef struct
40/* function register */ 44/* function register */
41/*********************/ 45/*********************/
42extern int DIVERT_REG_NAME(isdn_divert_if *); 46extern int DIVERT_REG_NAME(isdn_divert_if *);
47#endif