]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] drivers/net/tlan.c: #ifdef CONFIG_PCI the PCI specific code
authorAdrian Bunk <bunk@stusta.de>
Sat, 4 Feb 2006 23:37:47 +0000 (00:37 +0100)
committerJeff Garzik <jeff@garzik.org>
Fri, 24 Feb 2006 05:20:08 +0000 (00:20 -0500)
drivers/net/tlan.c compiles with CONFIG_PCI=n only with a warning and
due to the dead code elimination of gcc.

Additionally, this fixes the only compile error I found with
CONFIG_PCI=n and the gcc -Werror-implicit-function-declaration
flag on i386.

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/tlan.c

index c2506b56a18691f0eb4f4bfa9830fc8f877657a6..12076f8f942c7d40017bfefbd016f3fe5f3dc710 100644 (file)
@@ -536,6 +536,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
        u16                device_id;
        int                reg, rc = -ENODEV;
 
+#ifdef CONFIG_PCI
        if (pdev) {
                rc = pci_enable_device(pdev);
                if (rc)
@@ -547,6 +548,7 @@ static int __devinit TLan_probe1(struct pci_dev *pdev,
                        goto err_out;
                }
        }
+#endif  /*  CONFIG_PCI  */
 
        dev = alloc_etherdev(sizeof(TLanPrivateInfo));
        if (dev == NULL) {