Index: dc390.h
===================================================================
RCS file: /home/cvsroot/dc390/dc390.h,v
retrieving revision 2.43.2.14
retrieving revision 2.43.2.15
diff -u -r2.43.2.14 -r2.43.2.15
--- dc390.h	2000/05/25 15:18:37	2.43.2.14
+++ dc390.h	2000/05/29 09:06:54	2.43.2.15
@@ -4,7 +4,7 @@
  *	Description: Device Driver for Tekram DC-390(T) PCI SCSI       *
  *		     Bus Master Host Adapter			       *
  ***********************************************************************/
-/* $Id: dc390.h,v 2.43.2.14 2000/05/25 15:18:37 garloff Exp $ */
+/* $Id: dc390.h,v 2.43.2.15 2000/05/29 09:06:54 garloff Exp $ */
 
 /*
  * DC390/AMD 53C974 driver, header file
@@ -19,7 +19,7 @@
 #endif
 
 #define DC390_BANNER "Tekram DC390/AM53C974"
-#define DC390_VERSION "2.0e1 2000/05/25"
+#define DC390_VERSION "2.0e2 2000/05/27"
 
 /* We don't have eh_abort_handler, eh_device_reset_handler, 
  * eh_bus_reset_handler, eh_host_reset_handler yet! 
Index: tmscsim.c
===================================================================
RCS file: /home/cvsroot/dc390/tmscsim.c,v
retrieving revision 2.60.2.20
retrieving revision 2.60.2.22
diff -u -r2.60.2.20 -r2.60.2.22
--- tmscsim.c	2000/05/25 15:18:37	2.60.2.20
+++ tmscsim.c	2000/05/29 09:06:54	2.60.2.22
@@ -7,7 +7,7 @@
  ***********************************************************************/
 /* (C) Copyright: put under GNU GPL in 10/96  (see README.tmscsim)	*
 *************************************************************************/
-/* $Id: tmscsim.c,v 2.60.2.20 2000/05/25 15:18:37 garloff Exp $		*/
+/* $Id: tmscsim.c,v 2.60.2.22 2000/05/29 09:06:54 garloff Exp $		*/
 /*	Enhancements and bugfixes by					*
  *	Kurt Garloff <kurt@garloff.de>	<garloff@suse.de>		*
  ***********************************************************************/
@@ -153,7 +153,8 @@
  * 				Reset: Unlock, but refuse to queue	*
  * 				2.3 __setup function			*
  *	2.0e  00/05/22	KG	Return residual for 2.3			*
- *	2.0e1 00/02/25	KG	Compile fixes for 2.3.99		*
+ *	2.0e1 00/05/25	KG	Compile fixes for 2.3.99		*
+ *	2.0e2 00/05/27	KG	Jeff Garzik's pci_enable_device()	*
  ***********************************************************************/
 
 /* Uncomment SA_INTERRUPT, if the driver refuses to share its IRQ with other devices */
@@ -2247,6 +2248,10 @@
     if ( PCI_PRESENT )
 	while (PCI_FIND_DEVICE (PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD53C974))
 	{
+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,3,30)
+	    if (pci_enable_device (pdev))
+		continue;
+#endif
 	    //DC390_LOCK_IO;		/* Remove this when going to new eh */
 	    PCI_GET_IO_AND_IRQ;
 	    DEBUG0(printk(KERN_INFO "DC390(%i): IO_PORT=%04x,IRQ=%x\n", dc390_adapterCnt, (UINT) io_port, irq);)