diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /drivers/net/appletalk/cops.c | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'drivers/net/appletalk/cops.c')
| -rw-r--r-- | drivers/net/appletalk/cops.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index 2161c2d585f0..9edaa183227a 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c | |||
| @@ -65,7 +65,7 @@ static const char *version = | |||
| 65 | #include <linux/etherdevice.h> | 65 | #include <linux/etherdevice.h> |
| 66 | #include <linux/skbuff.h> | 66 | #include <linux/skbuff.h> |
| 67 | #include <linux/if_arp.h> | 67 | #include <linux/if_arp.h> |
| 68 | #include <linux/if_ltalk.h> /* For ltalk_setup() */ | 68 | #include <linux/if_ltalk.h> |
| 69 | #include <linux/delay.h> /* For udelay() */ | 69 | #include <linux/delay.h> /* For udelay() */ |
| 70 | #include <linux/atalk.h> | 70 | #include <linux/atalk.h> |
| 71 | #include <linux/spinlock.h> | 71 | #include <linux/spinlock.h> |
| @@ -223,7 +223,7 @@ struct net_device * __init cops_probe(int unit) | |||
| 223 | int base_addr; | 223 | int base_addr; |
| 224 | int err = 0; | 224 | int err = 0; |
| 225 | 225 | ||
| 226 | dev = alloc_netdev(sizeof(struct cops_local), "lt%d", ltalk_setup); | 226 | dev = alloc_ltalkdev(sizeof(struct cops_local)); |
| 227 | if (!dev) | 227 | if (!dev) |
| 228 | return ERR_PTR(-ENOMEM); | 228 | return ERR_PTR(-ENOMEM); |
| 229 | 229 | ||