Re: 2.3.27 PATCH fixing unbalanced #endif in drivers/scsi/ini9100u.h

Alexander Viro (viro@math.psu.edu)
Fri, 12 Nov 1999 06:56:04 -0500 (EST)

OK, here is a patch cleaning some mess after the proc-patch-30b.
Summary:
remaining bogus externs removed from drivers/scsi/*.h (along with
the extra #endif in ini900u.h)
__NO_VERSION__ added where needed - places spotted by Keith +
fs/proc/inode.c
Al

diff -urN linux-2.3.27/drivers/scsi/ini9100u.h linux-bird.proc/drivers/scsi/ini9100u.h
--- linux-2.3.27/drivers/scsi/ini9100u.h Thu Nov 11 22:07:55 1999
+++ linux-bird.proc/drivers/scsi/ini9100u.h Fri Nov 12 06:43:56 1999
@@ -84,8 +84,6 @@
extern int i91u_reset(Scsi_Cmnd *, unsigned int);

extern int i91u_biosparam(Scsi_Disk *, kdev_t, int *); /*for linux v2.0 */
-extern struct proc_dir_entry proc_scsi_ini9100u;
-#endif

#define i91u_REVID "Initio INI-9X00U/UW SCSI device driver; Revision: 1.03g"

diff -urN linux-2.3.27/drivers/scsi/qlogicfc.h linux-bird.proc/drivers/scsi/qlogicfc.h
--- linux-2.3.27/drivers/scsi/qlogicfc.h Sun Sep 12 21:05:50 1999
+++ linux-bird.proc/drivers/scsi/qlogicfc.h Fri Nov 12 06:44:30 1999
@@ -86,8 +86,6 @@
#define NULL (0)
#endif

-extern struct proc_dir_entry proc_scsi_isp2x00;
-
#define QLOGICFC { \
detect: isp2x00_detect, \
release: isp2x00_release, \
diff -urN linux-2.3.27/drivers/scsi/qlogicisp.h linux-bird.proc/drivers/scsi/qlogicisp.h
--- linux-2.3.27/drivers/scsi/qlogicisp.h Sun Sep 12 13:55:11 1999
+++ linux-bird.proc/drivers/scsi/qlogicisp.h Fri Nov 12 06:44:42 1999
@@ -70,8 +70,6 @@
#define NULL (0)
#endif

-extern struct proc_dir_entry proc_scsi_isp1020;
-
#define QLOGICISP { \
detect: isp1020_detect, \
release: isp1020_release, \
diff -urN linux-2.3.27/drivers/scsi/qlogicpti.h linux-bird.proc/drivers/scsi/qlogicpti.h
--- linux-2.3.27/drivers/scsi/qlogicpti.h Sun Sep 12 13:55:11 1999
+++ linux-bird.proc/drivers/scsi/qlogicpti.h Fri Nov 12 06:45:13 1999
@@ -163,8 +163,6 @@
int qlogicpti_abort(Scsi_Cmnd *);
int qlogicpti_reset(Scsi_Cmnd *, unsigned int);

-extern struct proc_dir_entry proc_scsi_qlogicpti;
-
/* mailbox command complete status codes */
#define MBOX_COMMAND_COMPLETE 0x4000
#define INVALID_COMMAND 0x4001
diff -urN linux-2.3.27/fs/nfsd/stats.c linux-bird.proc/fs/nfsd/stats.c
--- linux-2.3.27/fs/nfsd/stats.c Thu Nov 11 22:08:01 1999
+++ linux-bird.proc/fs/nfsd/stats.c Fri Nov 12 06:48:21 1999
@@ -17,6 +17,7 @@
#include <linux/sched.h>
#include <linux/proc_fs.h>
#include <linux/stat.h>
+#define __NO_VERSION__
#include <linux/module.h>

#include <linux/sunrpc/svc.h>
diff -urN linux-2.3.27/fs/proc/inode.c linux-bird.proc/fs/proc/inode.c
--- linux-2.3.27/fs/proc/inode.c Thu Nov 11 22:08:02 1999
+++ linux-bird.proc/fs/proc/inode.c Fri Nov 12 06:48:42 1999
@@ -14,6 +14,7 @@
#include <linux/locks.h>
#include <linux/limits.h>
#include <linux/config.h>
+#define __NO_VERSION__
#include <linux/module.h>

#include <asm/system.h>
diff -urN linux-2.3.27/net/irda/irproc.c linux-bird.proc/net/irda/irproc.c
--- linux-2.3.27/net/irda/irproc.c Thu Nov 11 22:08:05 1999
+++ linux-bird.proc/net/irda/irproc.c Fri Nov 12 06:49:19 1999
@@ -25,6 +25,7 @@

#include <linux/miscdevice.h>
#include <linux/proc_fs.h>
+#define __NO_VERSION__
#include <linux/module.h>

#include <net/irda/irda.h>
diff -urN linux-2.3.27/net/sunrpc/sysctl.c linux-bird.proc/net/sunrpc/sysctl.c
--- linux-2.3.27/net/sunrpc/sysctl.c Thu Nov 11 22:08:05 1999
+++ linux-bird.proc/net/sunrpc/sysctl.c Fri Nov 12 06:49:50 1999
@@ -14,6 +14,7 @@
#include <linux/ctype.h>
#include <linux/fs.h>
#include <linux/sysctl.h>
+#define __NO_VERSION__
#include <linux/module.h>

#include <asm/uaccess.h>

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/