Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[pandora-kernel.git] / include / linux / kernelcapi.h

diff --git a/include/linux/kernelcapi.h b/include/linux/kernelcapi.h
index 9c26839..9be37da 100644 (file)
--- a/include/linux/kernelcapi.h
+++ b/include/linux/kernelcapi.h
@@ -6,49 +6,15 @@
  * (c) Copyright 1997 by Carsten Paeth (calle@calle.in-berlin.de)
  * 
  */
-
 #ifndef __KERNELCAPI_H__
 #define __KERNELCAPI_H__
 
-#define CAPI_MAXAPPL   240     /* maximum number of applications  */
-#define CAPI_MAXCONTR  32      /* maximum number of controller    */
-#define CAPI_MAXDATAWINDOW     8
-
-
-typedef struct kcapi_flagdef {
-       int contr;
-       int flag;
-} kcapi_flagdef;
-
-typedef struct kcapi_carddef {
-       char            driver[32];
-       unsigned int    port;
-       unsigned        irq;
-       unsigned int    membase;
-       int             cardnr;
-} kcapi_carddef;
-
-/* new ioctls >= 10 */
-#define KCAPI_CMD_TRACE                10
-#define KCAPI_CMD_ADDCARD      11      /* OBSOLETE */
-
-/* 
- * flag > 2 => trace also data
- * flag & 1 => show trace
- */
-#define KCAPI_TRACE_OFF                        0
-#define KCAPI_TRACE_SHORT_NO_DATA      1
-#define KCAPI_TRACE_FULL_NO_DATA       2
-#define KCAPI_TRACE_SHORT              3
-#define KCAPI_TRACE_FULL               4
-
-
-#ifdef __KERNEL__
 
 #include <linux/list.h>
 #include <linux/skbuff.h>
 #include <linux/workqueue.h>
 #include <linux/notifier.h>
+#include <uapi/linux/kernelcapi.h>
 
 struct capi20_appl {
        u16 applid;
@@ -150,6 +116,4 @@ typedef enum {
        CapiCallGivenToOtherApplication                 = 0x3304,
 } CAPI_REASON;
 
-#endif                         /* __KERNEL__ */
-
 #endif                         /* __KERNELCAPI_H__ */