From 97b9d608757e1f7bb214ec646d08e148c036c8e8 Mon Sep 17 00:00:00 2001
From: guillemj <>
Date: Sun, 3 Dec 2006 07:09:57 +0000
Subject: [PATCH] 	* 3dfx_device.c (id_table_3dfx): Move newar the
 corresponding ifdef 	for older kernels. 	(findCards): Likewise. 
 (driver_3dfx): Forward declare.

---
 Device3Dfx/3dfx_driver.c | 45 +++++++++++++++++++++-------------------
 Device3Dfx/ChangeLog     |  7 +++++++
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/Device3Dfx/3dfx_driver.c b/Device3Dfx/3dfx_driver.c
index 5d1e301..711ca22 100644
--- a/Device3Dfx/3dfx_driver.c
+++ b/Device3Dfx/3dfx_driver.c
@@ -141,6 +141,23 @@
 
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 static char name_3dfx[] = "3dfx";
+
+static struct pci_device_id id_table_3dfx[] = {
+	{PCI_VENDOR_ID_3DFX,		PCI_DEVICE_ID_3DFX_VOODOO,
+	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{PCI_VENDOR_ID_3DFX,		PCI_DEVICE_ID_3DFX_VOODOO2,
+	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{PCI_VENDOR_ID_ALLIANCE,	PCI_DEVICE_ID_ALLIANCE_AT3D,
+	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{PCI_VENDOR_ID_MACRONIX,	PCI_DEVICE_ID_MACRONIX_MX86251,
+	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{PCI_VENDOR_ID_3DFX,		PCI_DEVICE_ID_3DFX_BANSHEE,
+	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{PCI_VENDOR_ID_3DFX,		PCI_DEVICE_ID_3DFX_VOODOO3,
+	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{PCI_VENDOR_ID_3DFX,		PCI_DEVICE_ID_3DFX_VOODOO4,
+	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+};
 #else /* LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0) */
 static struct pci_card {
 	unsigned short vendor;
@@ -261,6 +278,13 @@ static int findCards(void)
 
 	return numCards;
 }
+#else
+static struct pci_driver driver_3dfx;
+
+static void findCards(void)
+{
+	pci_register_driver(&driver_3dfx);
+}
 #endif
 
 static int open_3dfx(struct inode *inode, struct file *file)
@@ -760,22 +784,6 @@ static void remove_3dfx(struct pci_dev *dev)
 
 }
 
-static struct pci_device_id id_table_3dfx[] = {
-	{PCI_VENDOR_ID_3DFX,		PCI_DEVICE_ID_3DFX_VOODOO,
-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-	{PCI_VENDOR_ID_3DFX,		PCI_DEVICE_ID_3DFX_VOODOO2,
-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-	{PCI_VENDOR_ID_ALLIANCE,	PCI_DEVICE_ID_ALLIANCE_AT3D,
-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-	{PCI_VENDOR_ID_MACRONIX,	PCI_DEVICE_ID_MACRONIX_MX86251,
-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-	{PCI_VENDOR_ID_3DFX,		PCI_DEVICE_ID_3DFX_BANSHEE,
-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-	{PCI_VENDOR_ID_3DFX,		PCI_DEVICE_ID_3DFX_VOODOO3,
-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-	{PCI_VENDOR_ID_3DFX,		PCI_DEVICE_ID_3DFX_VOODOO4,
-	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
-};
 MODULE_DEVICE_TABLE(pci, id_table_3dfx);
 
 static struct pci_driver driver_3dfx = {
@@ -784,11 +792,6 @@ static struct pci_driver driver_3dfx = {
 	.probe =	probe_3dfx,
 	.remove =	remove_3dfx,
 };
-
-static void findCards(void)
-{
-	pci_register_driver(&driver_3dfx);
-}
 #endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) */
 
 #ifdef MODULE
diff --git a/Device3Dfx/ChangeLog b/Device3Dfx/ChangeLog
index 1e14f9d..a11dc28 100644
--- a/Device3Dfx/ChangeLog
+++ b/Device3Dfx/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-03  Guillem Jover  <guillem@hadrons.org>
+
+	* 3dfx_device.c (id_table_3dfx): Move newar the corresponding ifdef
+	for older kernels.
+	(findCards): Likewise.
+	(driver_3dfx): Forward declare.
+
 2006-12-03  Guillem Jover  <guillem@hadrons.org>
 
 	Rename functions obsoleted in linux 2.1.93.