diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-06-20 20:36:38 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-06-20 20:36:38 +0000 |
| commit | 75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d (patch) | |
| tree | c2f02ee30609d0d69308b4ca80d68d02a5f85552 /drivers/net/hp.c | |
| parent | 0fd1ffe0633b4b039b343b753598e6df435e034d (diff) | |
| parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
| download | kernel-crypto-75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d.tar.gz kernel-crypto-75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d.tar.xz kernel-crypto-75ba632a01d4dc70d0a0f3a92b5ec9b4a3644b2d.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/hp.c')
| -rw-r--r-- | drivers/net/hp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hp.c b/drivers/net/hp.c index cf9fb3698a6..551a71b3c5f 100644 --- a/drivers/net/hp.c +++ b/drivers/net/hp.c @@ -384,7 +384,7 @@ hp_block_output(struct net_device *dev, int count, } /* This function resets the ethercard if something screws up. */ -static void +static void __init hp_init_card(struct net_device *dev) { int irq = dev->irq; @@ -409,7 +409,7 @@ MODULE_LICENSE("GPL"); /* This is set up so that only a single autoprobe takes place per call. ISA device autoprobes on a running machine are not recommended. */ -int +int __init init_module(void) { struct net_device *dev; |