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
/
appletalk
/
cops.c
diff --git
a/drivers/net/appletalk/cops.c
b/drivers/net/appletalk/cops.c
index
2161c2d
..
dba5e51
100644
(file)
--- a/
drivers/net/appletalk/cops.c
+++ b/
drivers/net/appletalk/cops.c
@@
-48,7
+48,6
@@
static const char *version =
* the driver figure it out.
*/
* the driver figure it out.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@
-65,7
+64,7
@@
static const char *version =
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/if_arp.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/if_arp.h>
-#include <linux/if_ltalk.h>
/* For ltalk_setup() */
+#include <linux/if_ltalk.h>
#include <linux/delay.h> /* For udelay() */
#include <linux/atalk.h>
#include <linux/spinlock.h>
#include <linux/delay.h> /* For udelay() */
#include <linux/atalk.h>
#include <linux/spinlock.h>
@@
-189,7
+188,7
@@
static void cops_reset (struct net_device *dev, int sleep);
static void cops_load (struct net_device *dev);
static int cops_nodeid (struct net_device *dev, int nodeid);
static void cops_load (struct net_device *dev);
static int cops_nodeid (struct net_device *dev, int nodeid);
-static irqreturn_t cops_interrupt (int irq, void *dev_id
, struct pt_regs *regs
);
+static irqreturn_t cops_interrupt (int irq, void *dev_id);
static void cops_poll (unsigned long ltdev);
static void cops_timeout(struct net_device *dev);
static void cops_rx (struct net_device *dev);
static void cops_poll (unsigned long ltdev);
static void cops_timeout(struct net_device *dev);
static void cops_rx (struct net_device *dev);
@@
-223,7
+222,7
@@
struct net_device * __init cops_probe(int unit)
int base_addr;
int err = 0;
int base_addr;
int err = 0;
- dev = alloc_
netdev(sizeof(struct cops_local), "lt%d", ltalk_setup
);
+ dev = alloc_
ltalkdev(sizeof(struct cops_local)
);
if (!dev)
return ERR_PTR(-ENOMEM);
if (!dev)
return ERR_PTR(-ENOMEM);
@@
-722,7
+721,7
@@
static void cops_poll(unsigned long ltdev)
* The typical workload of the driver:
* Handle the network interface interrupts.
*/
* The typical workload of the driver:
* Handle the network interface interrupts.
*/
-static irqreturn_t cops_interrupt(int irq, void *dev_id
, struct pt_regs * regs
)
+static irqreturn_t cops_interrupt(int irq, void *dev_id)
{
struct net_device *dev = dev_id;
struct cops_local *lp;
{
struct net_device *dev = dev_id;
struct cops_local *lp;
@@
-1031,7
+1030,7
@@
module_param(io, int, 0);
module_param(irq, int, 0);
module_param(board_type, int, 0);
module_param(irq, int, 0);
module_param(board_type, int, 0);
-int init_module(void)
+int
__init
init_module(void)
{
if (io == 0)
printk(KERN_WARNING "%s: You shouldn't autoprobe with insmod\n",
{
if (io == 0)
printk(KERN_WARNING "%s: You shouldn't autoprobe with insmod\n",
@@
-1042,7
+1041,7
@@
int init_module(void)
return 0;
}
return 0;
}
-void cleanup_module(void)
+void
__exit
cleanup_module(void)
{
unregister_netdev(cops_dev);
cleanup_card(cops_dev);
{
unregister_netdev(cops_dev);
cleanup_card(cops_dev);