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
/
ne-h8300.c
diff --git
a/drivers/net/ne-h8300.c
b/drivers/net/ne-h8300.c
index
86f34b5
..
84e291e
100644
(file)
--- a/
drivers/net/ne-h8300.c
+++ b/
drivers/net/ne-h8300.c
@@
-34,6
+34,8
@@
static const char version1[] =
#include "8390.h"
#include "8390.h"
+#define DRV_NAME "ne-h8300"
+
/* Some defines that people can play with if so inclined. */
/* Do we perform extra sanity checks on stuff ? */
/* Some defines that people can play with if so inclined. */
/* Do we perform extra sanity checks on stuff ? */
@@
-156,6
+158,7
@@
static void cleanup_card(struct net_device *dev)
release_region(dev->base_addr, NE_IO_EXTENT);
}
release_region(dev->base_addr, NE_IO_EXTENT);
}
+#ifndef MODULE
struct net_device * __init ne_probe(int unit)
{
struct net_device *dev = alloc_ei_netdev();
struct net_device * __init ne_probe(int unit)
{
struct net_device *dev = alloc_ei_netdev();
@@
-187,6
+190,7
@@
out:
free_netdev(dev);
return ERR_PTR(err);
}
free_netdev(dev);
return ERR_PTR(err);
}
+#endif
static int __init ne_probe1(struct net_device *dev, int ioaddr)
{
static int __init ne_probe1(struct net_device *dev, int ioaddr)
{
@@
-200,7
+204,7
@@
static int __init ne_probe1(struct net_device *dev, int ioaddr)
struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
unsigned char bus_width;
struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
unsigned char bus_width;
- if (!request_region(ioaddr, NE_IO_EXTENT,
dev->name
))
+ if (!request_region(ioaddr, NE_IO_EXTENT,
DRV_NAME
))
return -EBUSY;
reg0 = inb_p(ioaddr);
return -EBUSY;
reg0 = inb_p(ioaddr);