git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
net
/
hp100.c
diff --git
a/drivers/net/hp100.c
b/drivers/net/hp100.c
index
a845c11
..
78ae4b2
100644
(file)
--- a/
drivers/net/hp100.c
+++ b/
drivers/net/hp100.c
@@
-386,6
+386,7
@@
static int __init hp100_isa_probe(struct net_device *dev, int addr)
}
}
+#ifndef MODULE
struct net_device * __init hp100_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private));
struct net_device * __init hp100_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private));
@@
-420,6
+421,7
@@
struct net_device * __init hp100_probe(int unit)
free_netdev(dev);
return ERR_PTR(err);
}
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static int __init hp100_probe1(struct net_device *dev, int ioaddr,
u_char bus, struct pci_dev *pci_dev)
static int __init hp100_probe1(struct net_device *dev, int ioaddr,
u_char bus, struct pci_dev *pci_dev)