LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [2.6 patch] fix tlan.c for !PCI
@ 2004-05-12 23:51 Adrian Bunk
  2004-05-15 19:15 ` [Tlan-devel] " Samuel S Chessman
  0 siblings, 1 reply; 2+ messages in thread
From: Adrian Bunk @ 2004-05-12 23:51 UTC (permalink / raw)
  To: chessman; +Cc: tlan-devel, jgarzik, linux-net, linux-kernel

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);

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [Tlan-devel] [2.6 patch] fix tlan.c for !PCI
  2004-05-12 23:51 [2.6 patch] fix tlan.c for !PCI Adrian Bunk
@ 2004-05-15 19:15 ` Samuel S Chessman
  0 siblings, 0 replies; 2+ messages in thread
From: Samuel S Chessman @ 2004-05-15 19:15 UTC (permalink / raw)
  To: Adrian Bunk; +Cc: tlan-devel, jgarzik, linux-net, linux-kernel

On Thu, 13 May 2004, Adrian Bunk wrote:

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

<snip/>

> The patch below fixes this issue.
>
> Please apply
> Adrian

<snip/>

Thanks for the patch, Adrian.
I will get to this as soon as my day job allows.
Sam

-- 
   Sam Chessman                                         chessman (a) tux.org
    First do what's necessary, then what's possible, finally the impossible.


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2004-05-15 19:16 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2004-05-12 23:51 [2.6 patch] fix tlan.c for !PCI Adrian Bunk
2004-05-15 19:15 ` [Tlan-devel] " Samuel S Chessman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).