projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'r8169-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...
[deliverable/linux.git]
/
drivers
/
net
/
ioc3-eth.c
diff --git
a/drivers/net/ioc3-eth.c
b/drivers/net/ioc3-eth.c
index 373f72cdbe8e4d12922d3e41984d876e8006942c..1f25263dc7ebb8f90066d7388bbd297bd8d82b26 100644
(file)
--- a/
drivers/net/ioc3-eth.c
+++ b/
drivers/net/ioc3-eth.c
@@
-1221,7
+1221,8
@@
static void __devinit ioc3_serial_probe(struct pci_dev *pdev, struct ioc3 *ioc3)
}
#endif
-static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
+static int __devinit ioc3_probe(struct pci_dev *pdev,
+ const struct pci_device_id *ent)
{
unsigned int sw_physid1, sw_physid2;
struct net_device *dev = NULL;
This page took
0.027158 seconds
and
5
git commands to generate.