[LV-kern-commit] CVS: kernel-2.4/drivers/ide ide-disk.c,1.2,1.3 ide-floppy.c,1.2,1.3 ide-tape.c,1.2,1.3

[Dave A. <ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/ide
In directory sc8-pr-cvs1:/tmp/cvs-serv7538/drivers/ide

Modified Files:
	ide-disk.c ide-floppy.c ide-tape.c 
Log Message:
DA: sync with Marcelo 2.4.17


Index: ide-disk.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/ide/ide-disk.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ide-disk.c	10 Apr 2002 15:32:19 -0000	1.2
+++ ide-disk.c	10 Jun 2003 01:13:29 -0000	1.3
@@ -858,8 +858,10 @@
 		}
 		/* We must remove proc entries defined in this module.
 		   Otherwise we oops while accessing these entries */
+#ifdef CONFIG_PROC_FS
 		if (drive->proc)
 			ide_remove_proc_entries(drive->proc, idedisk_proc);
+#endif
 	}
 	ide_unregister_module(&idedisk_module);
 }

Index: ide-floppy.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/ide/ide-floppy.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ide-floppy.c	10 Apr 2002 15:32:19 -0000	1.2
+++ ide-floppy.c	10 Jun 2003 01:13:29 -0000	1.3
@@ -2071,8 +2071,10 @@
 		}
 		/* We must remove proc entries defined in this module.
 		   Otherwise we oops while accessing these entries */
+#ifdef CONFIG_PROC_FS
 		if (drive->proc)
 			ide_remove_proc_entries(drive->proc, idefloppy_proc);
+#endif
 	}
 	ide_unregister_module(&idefloppy_module);
 }

Index: ide-tape.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/ide/ide-tape.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ide-tape.c	10 Apr 2002 15:32:19 -0000	1.2
+++ ide-tape.c	10 Jun 2003 01:13:29 -0000	1.3
@@ -6182,6 +6182,7 @@
 };
 
 MODULE_DESCRIPTION("ATAPI Streaming TAPE Driver");
+MODULE_LICENSE("GPL");
 
 static void __exit idetape_exit (void)
 {