fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / net / irda / irnet / irnet.h

diff --git a/net/irda/irnet/irnet.h b/net/irda/irnet/irnet.h
index 0ed25a1..8088752 100644 (file)
--- a/net/irda/irnet/irnet.h
+++ b/net/irda/irnet/irnet.h
@@ -244,11 +244,10 @@
 #include <linux/skbuff.h>
 #include <linux/tty.h>
 #include <linux/proc_fs.h>
-#include <linux/devfs_fs_kernel.h>
 #include <linux/netdevice.h>
 #include <linux/miscdevice.h>
 #include <linux/poll.h>
-#include <linux/config.h>
+#include <linux/capability.h>
 #include <linux/ctype.h>       /* isspace() */
 #include <asm/uaccess.h>
 #include <linux/init.h>
@@ -363,13 +362,13 @@
 /* Exit a function with debug */
 #define DRETURN(ret, dbg, args...) \
        {DEXIT(dbg, ": " args);\
-       return(ret); }
+       return ret; }
 
 /* Exit a function on failed condition */
 #define DABORT(cond, ret, dbg, args...) \
        {if(cond) {\
                DERROR(dbg, args);\
-               return(ret); }}
+               return ret; }}
 
 /* Invalid assertion, print out an error and exit... */
 #define DASSERT(cond, ret, dbg, args...) \
@@ -517,11 +516,6 @@ extern int
        irda_irnet_init(void);          /* Initialise IrDA part of IrNET */
 extern void
        irda_irnet_cleanup(void);       /* Teardown IrDA part of IrNET */
-/* ---------------------------- MODULE ---------------------------- */
-extern int
-       irnet_init(void);               /* Initialise IrNET module */
-extern void
-       irnet_cleanup(void);            /* Teardown IrNET module */
 
 /**************************** VARIABLES ****************************/