[2.6 patch] fix tlan.c for !PCI

From: Adrian Bunk
Date: Wed May 12 2004 - 18:51:32 EST


I got the following compile error in 2.6.6-mm1 (but it's not specific to
-mm) with CONFIG_PCI=n:

<-- snip -->

...
CC drivers/net/tlan.o
drivers/net/tlan.c: In function `tlan_remove_one':
drivers/net/tlan.c:449: warning: implicit declaration of function `pci_release_regions'
...
LD .tmp_vmlinux1
drivers/built-in.o(.text+0x135183): In function `tlan_remove_one':
: undefined reference to `pci_release_regions'
drivers/built-in.o(.text+0x13541f): In function `TLan_probe1':
: undefined reference to `pci_release_regions'
make: *** [.tmp_vmlinux1] Error 1

<-- snip -->

The patch below fixes this issue.

Please apply
Adrian

--- linux-2.6.6-mm1-full/drivers/net/tlan.c.old 2004-05-13 01:19:33.000000000 +0200
+++ linux-2.6.6-mm1-full/drivers/net/tlan.c 2004-05-13 01:22:15.000000000 +0200
@@ -446,7 +446,9 @@
pci_free_consistent(priv->pciDev, priv->dmaSize, priv->dmaStorage, priv->dmaStorageDMA );
}

+#ifdef CONFIG_PCI
pci_release_regions(pdev);
+#endif

free_netdev( dev );

@@ -673,8 +675,10 @@
err_out_free_dev:
free_netdev(dev);
err_out_regions:
+#ifdef CONFIG_PCI
if (pdev)
pci_release_regions(pdev);
+#endif
err_out:
if (pdev)
pci_disable_device(pdev);
-
To unsubscribe from this list: send the line "unsubscribe linux-net" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html