apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source 
Conflicts:

	drivers/net/ixgbe/ixgbe_main.c
	drivers/net/smc91x.c
This commit is contained in:
David S. Miller
2008-12-02 19:50:27 -08:00
parent 68024541e2 f6f7b52e2f
commit aa2ba5f108
366 changed files with 6931 additions and 3699 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/pcmcia/ibmtr_cs.c
+1 -1
View File
@@ -349,7 +349,7 @@ static int ibmtr_suspend(struct pcmcia_device *link)
return 0;
}
static int ibmtr_resume(struct pcmcia_device *link)
static int __devinit ibmtr_resume(struct pcmcia_device *link)
{
ibmtr_dev_t *info = link->priv;
struct net_device *dev = info->dev;