From 7126080925459874b526e4568c6af7681c74e98b Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sun, 10 Feb 2002 04:21:24 +0000
Subject: [PATCH] Removal of 2.0 PCI support

---
 comedi/drivers/amcc_s5933.c | 4 ----
 comedi/drivers/amcc_s5933.h | 3 ---
 comedi/drivers/icp_multi.h  | 3 ---
 comedi/drivers/ni_labpc.c   | 4 ----
 comedi/drivers/ni_pcidio.c  | 6 ------
 comedi/drivers/ni_pcimio.c  | 6 ------
 6 files changed, 26 deletions(-)

diff --git a/comedi/drivers/amcc_s5933.c b/comedi/drivers/amcc_s5933.c
index 55655444..4b8abb1b 100644
--- a/comedi/drivers/amcc_s5933.c
+++ b/comedi/drivers/amcc_s5933.c
@@ -20,10 +20,6 @@
 
 #include "amcc_s5933.h"
 
-#ifdef PCI_SUPPORT_VER1
-#error    Sorry, no support for 2.1.55 and older! :-((((
-#endif
-
 
 /****************************************************************************/
 
diff --git a/comedi/drivers/amcc_s5933.h b/comedi/drivers/amcc_s5933.h
index b602dfbf..0ff3328b 100644
--- a/comedi/drivers/amcc_s5933.h
+++ b/comedi/drivers/amcc_s5933.h
@@ -18,9 +18,6 @@
 #include <linux/pci.h>
 #include <linux/comedidev.h>
 
-#ifdef PCI_SUPPORT_VER1
-#error    Sorry, no support for 2.1.55 and older! :-((((
-#endif
 
 
 /****************************************************************************/
diff --git a/comedi/drivers/icp_multi.h b/comedi/drivers/icp_multi.h
index 04fc99ee..b7e80e78 100644
--- a/comedi/drivers/icp_multi.h
+++ b/comedi/drivers/icp_multi.h
@@ -13,9 +13,6 @@
 #include <linux/pci.h>
 #include <linux/comedidev.h>
 
-#ifdef PCI_SUPPORT_VER1
-#error    Sorry, no support for 2.1.55 and older! :-((((
-#endif
 
 
 /****************************************************************************/
diff --git a/comedi/drivers/ni_labpc.c b/comedi/drivers/ni_labpc.c
index 5ae7432f..9561d377 100644
--- a/comedi/drivers/ni_labpc.c
+++ b/comedi/drivers/ni_labpc.c
@@ -764,11 +764,7 @@ static struct mite_struct* labpc_find_device(int bus, int slot)
 		// if bus/slot are specified then make sure we have the right bus/slot
 		if(bus || slot)
 		{
-#ifdef PCI_SUPPORT_VER1
-			if(bus != mite->pci_bus || slot! = PCI_SLOT(mite->pci_device_fn)) continue;
-#else
 			if(bus != mite->pcidev->bus->number || slot != PCI_SLOT(mite->pcidev->devfn)) continue;
-#endif
 		}
 		for(i = 0; i < driver_labpc.num_names; i++)
 		{
diff --git a/comedi/drivers/ni_pcidio.c b/comedi/drivers/ni_pcidio.c
index f1afde6e..ab0d2749 100644
--- a/comedi/drivers/ni_pcidio.c
+++ b/comedi/drivers/ni_pcidio.c
@@ -1016,15 +1016,9 @@ static int nidio_find_device(comedi_device *dev,int bus,int slot)
 	for(mite=mite_devices;mite;mite=mite->next){
 		if(mite->used)continue;
 		if(bus || slot){
-#ifdef PCI_SUPPORT_VER1
-			if(bus!=(mite->pci_bus<<8) ||
-			   slot!=PCI_SLOT(mite->pci_device_fn))
-				continue;
-#else
 			if(bus!=(mite->pcidev->bus->number<<8) ||
 			   slot!=PCI_SLOT(mite->pcidev->devfn))
 				continue;
-#endif
 		}
 		for(i=0;i<n_nidio_boards;i++){
 			if(mite_device_id(mite)==nidio_boards[i].dev_id){
diff --git a/comedi/drivers/ni_pcimio.c b/comedi/drivers/ni_pcimio.c
index c906eec7..f54da678 100644
--- a/comedi/drivers/ni_pcimio.c
+++ b/comedi/drivers/ni_pcimio.c
@@ -645,15 +645,9 @@ static int pcimio_find_device(comedi_device *dev,int bus,int slot)
 	for(mite=mite_devices;mite;mite=mite->next){
 		if(mite->used)continue;
 		if(bus || slot){
-#ifdef PCI_SUPPORT_VER1
-			if(bus!=mite->pci_bus ||
-			   slot!=PCI_SLOT(mite->pci_device_fn))
-				continue;
-#else
 			if(bus!=mite->pcidev->bus->number ||
 			   slot!=PCI_SLOT(mite->pcidev->devfn))
 				continue;
-#endif
 		}
 
 		for(i=0;i<n_pcimio_boards;i++){
-- 
2.26.2