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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
net
/
arcnet
/
com20020.c
diff --git
a/drivers/net/arcnet/com20020.c
b/drivers/net/arcnet/com20020.c
index
b40ee3f
..
aa9dd8f
100644
(file)
--- a/
drivers/net/arcnet/com20020.c
+++ b/
drivers/net/arcnet/com20020.c
@@
-159,7
+159,7
@@
int com20020_found(struct net_device *dev, int shared)
/* Initialize the rest of the device structure. */
/* Initialize the rest of the device structure. */
- lp =
(struct arcnet_local *)
dev->priv;
+ lp = dev->priv;
lp->hw.owner = THIS_MODULE;
lp->hw.command = com20020_command;
lp->hw.owner = THIS_MODULE;
lp->hw.command = com20020_command;
@@
-233,7
+233,7
@@
int com20020_found(struct net_device *dev, int shared)
*/
static int com20020_reset(struct net_device *dev, int really_reset)
{
*/
static int com20020_reset(struct net_device *dev, int really_reset)
{
- struct arcnet_local *lp =
(struct arcnet_local *)
dev->priv;
+ struct arcnet_local *lp = dev->priv;
u_int ioaddr = dev->base_addr;
u_char inbyte;
u_int ioaddr = dev->base_addr;
u_char inbyte;
@@
-300,7
+300,7
@@
static int com20020_status(struct net_device *dev)
static void com20020_close(struct net_device *dev)
{
static void com20020_close(struct net_device *dev)
{
- struct arcnet_local *lp =
(struct arcnet_local *)
dev->priv;
+ struct arcnet_local *lp = dev->priv;
int ioaddr = dev->base_addr;
/* disable transmitter */
int ioaddr = dev->base_addr;
/* disable transmitter */
@@
-337,13
+337,16
@@
static void com20020_set_mc_list(struct net_device *dev)
}
}
}
}
-#if
def MODULE
-
+#if
defined(CONFIG_ARCNET_COM20020_PCI_MODULE) || \
+ defined(CONFIG_ARCNET_COM20020_ISA_MODULE)
EXPORT_SYMBOL(com20020_check);
EXPORT_SYMBOL(com20020_found);
EXPORT_SYMBOL(com20020_check);
EXPORT_SYMBOL(com20020_found);
+#endif
MODULE_LICENSE("GPL");
MODULE_LICENSE("GPL");
+#ifdef MODULE
+
int init_module(void)
{
BUGLVL(D_NORMAL) printk(VERSION);
int init_module(void)
{
BUGLVL(D_NORMAL) printk(VERSION);