patch-2.2.15 linux/net/irda/irproc.c

• Lines: 61
• Date: Fri Apr 21 12:47:16 2000
• Orig file: v2.2.14/net/irda/irproc.c
• Orig date: Sat Aug 14 02:26:54 1999

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/net/irda/irproc.c linux/net/irda/irproc.c
@@ -6,10 +6,11 @@
  * Status:        Experimental.
  * Author:        Thomas Davis, <ratbert@radiks.net>
  * Created at:    Sat Feb 21 21:33:24 1998
- * Modified at:   Fri May  7 08:06:49 1999
+ * Modified at:   Wed Jan  5 22:45:14 2000
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
- * 
- *     Copyright (c) 1998-1999, Thomas Davis, <ratbert@radiks.net>, 
+ *
+ *     Copyright (c) 1998-2000, Dag Brattli <dagb@cs.uit.no>
+ *     Copyright (c) 1998, Thomas Davis, <ratbert@radiks.net>, 
  *     All Rights Reserved.
  *      
  *     This program is free software; you can redistribute it and/or 
@@ -22,6 +23,9 @@
  *     
  ********************************************************************/
 
+#define __NO_VERSION__    /* irmod.c defines module_kernel_version */
+#include <linux/module.h>
+
 #include <linux/miscdevice.h>
 #include <linux/proc_fs.h>
 
@@ -30,8 +34,6 @@
 #include <net/irda/irlap.h>
 #include <net/irda/irlmp.h>
 
-extern int irda_device_proc_read(char *buf, char **start, off_t offset, 
-				 int len, int unused);
 extern int irlap_proc_read(char *buf, char **start, off_t offset, int len, 
 			   int unused);
 extern int irlmp_proc_read(char *buf, char **start, off_t offset, int len, 
@@ -42,18 +44,6 @@
 			   int unused);
 extern int discovery_proc_read(char *buf, char **start, off_t offset, int len, 
 			       int unused);
-static int proc_discovery_read(char *buf, char **start, off_t offset, int len,
-			       int unused);
-
-/* enum irda_directory_inos { */
-/* 	PROC_IRDA_LAP = 1, */
-/* 	PROC_IRDA_LMP, */
-/* 	PROC_IRDA_TTP, */
-/* 	PROC_IRDA_LPT, */
-/* 	PROC_IRDA_COMM, */
-/*  	PROC_IRDA_IRDA_DEVICE, */
-/* 	PROC_IRDA_IRIAS */
-/* }; */
 
 struct irda_entry {
 	char *name;
@@ -64,7 +54,6 @@
  
 static struct irda_entry dir[] = {
 	{"discovery",	discovery_proc_read},
-	{"irda_device",	irda_device_proc_read},
 	{"irttp",	irttp_proc_read},
 	{"irlmp",	irlmp_proc_read},
 	{"irlap",	irlap_proc_read},