diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 12:26:59 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-25 12:26:59 -0400 |
| commit | 363e065c02b1273364d5356711a83e7f548fc0c8 (patch) | |
| tree | 0df0e65da403ade33ade580c2770c97437b1b1af /drivers/net/hplance.c | |
| parent | 907b9bceb41fa46beae93f79cc4a2247df502c0f (diff) | |
| parent | 7c250413e5b7c3dfae89354725b70c76d7621395 (diff) | |
[GFS2] Fix up merge of Linus' kernel into GFS2
This fixes up a couple of conflicts when merging up with
Linus' latest kernel. This will hopefully allow GFS2 to
be more easily merged into forthcoming -mm and FC kernels
due to the "one line per header" format now used for the
kernel headers.
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Conflicts:
include/linux/Kbuild
include/linux/kernel.h
Diffstat (limited to 'drivers/net/hplance.c')
| -rw-r--r-- | drivers/net/hplance.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/hplance.c b/drivers/net/hplance.c index 68569346460..9c643f2a8d5 100644 --- a/drivers/net/hplance.c +++ b/drivers/net/hplance.c @@ -45,12 +45,12 @@ struct hplance_private { /* function prototypes... This is easy because all the grot is in the * generic LANCE support. All we have to support is probing for boards, - * plus board-specific init, open and close actions. + * plus board-specific init, open and close actions. * Oh, and we need to tell the generic code how to read and write LANCE registers... */ static int __devinit hplance_init_one(struct dio_dev *d, const struct dio_device_id *ent); -static void __devinit hplance_init(struct net_device *dev, +static void __devinit hplance_init(struct net_device *dev, struct dio_dev *d); static void __devexit hplance_remove_one(struct dio_dev *d); static void hplance_writerap(void *priv, unsigned short value); @@ -118,7 +118,7 @@ static void __init hplance_init(struct net_device *dev, struct dio_dev *d) unsigned long va = (d->resource.start + DIO_VIRADDRBASE); struct hplance_private *lp; int i; - + printk(KERN_INFO "%s: %s; select code %d, addr", dev->name, d->name, d->scode); /* reset the board */ @@ -136,7 +136,7 @@ static void __init hplance_init(struct net_device *dev, struct dio_dev *d) dev->get_stats = &lance_get_stats; dev->set_multicast_list = &lance_set_multicast; dev->dma = 0; - + for (i=0; i<6; i++) { /* The NVRAM holds our ethernet address, one nibble per byte, * at bytes NVRAMOFF+1,3,5,7,9... @@ -145,7 +145,7 @@ static void __init hplance_init(struct net_device *dev, struct dio_dev *d) | (in_8(va + HPLANCE_NVRAMOFF + i*4 + 3) & 0xF); printk("%c%2.2x", i == 0 ? ' ' : ':', dev->dev_addr[i]); } - + lp = netdev_priv(dev); lp->lance.name = (char*)d->name; /* discards const, shut up gcc */ lp->lance.base = va; @@ -196,7 +196,7 @@ static int hplance_open(struct net_device *dev) { int status; struct lance_private *lp = netdev_priv(dev); - + status = lance_open(dev); /* call generic lance open code */ if (status) return status; |