Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 289825
b: refs/heads/master
c: 5e6bbed
h: refs/heads/master
i:
  289823: 375c621
v: v3
  • Loading branch information
Paul Gortmaker authored and David S. Miller committed Jan 30, 2012
1 parent 227123f commit bd32278
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 26 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 3396c7823efb3a5b8630388c464e1034ea031ced
refs/heads/master: 5e6bbedd8238edbfee03d2950369edb08773cd3c
25 changes: 0 additions & 25 deletions trunk/drivers/net/ethernet/i825xx/sun3_82586.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ static int automatic_resume = 0; /* experimental .. better should be zero */
static int rfdadd = 0; /* rfdadd=1 may be better for 8K MEM cards */
static int fifo=0x8; /* don't change */

#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/errno.h>
Expand Down Expand Up @@ -1151,28 +1150,6 @@ static void set_multicast_list(struct net_device *dev)
netif_wake_queue(dev);
}

#ifdef MODULE
#error This code is not currently supported as a module
static struct net_device *dev_sun3_82586;

int init_module(void)
{
dev_sun3_82586 = sun3_82586_probe(-1);
if (IS_ERR(dev_sun3_82586))
return PTR_ERR(dev_sun3_82586);
return 0;
}

void cleanup_module(void)
{
unsigned long ioaddr = dev_sun3_82586->base_addr;
unregister_netdev(dev_sun3_82586);
release_region(ioaddr, SUN3_82586_TOTAL_SIZE);
iounmap((void *)ioaddr);
free_netdev(dev_sun3_82586);
}
#endif /* MODULE */

#if 0
/*
* DUMP .. we expect a not running CMD unit and enough space
Expand Down Expand Up @@ -1209,5 +1186,3 @@ void sun3_82586_dump(struct net_device *dev,void *ptr)
printk("\n");
}
#endif

MODULE_LICENSE("GPL");

0 comments on commit bd32278

Please sign in to comment.