diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 22:05:59 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-09-24 22:05:59 +0100 |
| commit | 02b25fcff676125a88169c8a78d4c6dd647574ed (patch) | |
| tree | 372fc8e885be41ba1819b2767c8889ecd97ff948 /drivers/net/hp-plus.c | |
| parent | 1694176a210189312e31b083bac1e1688981219a (diff) | |
| parent | a68aa1cc6f3203b8a332683ebde67a00f39eec43 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/net/hp-plus.c')
| -rw-r--r-- | drivers/net/hp-plus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c index e26a3e407d7..6abcfd2a4b2 100644 --- a/drivers/net/hp-plus.c +++ b/drivers/net/hp-plus.c @@ -112,7 +112,7 @@ static void hpp_io_block_output(struct net_device *dev, int count, static void hpp_io_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr, int ring_page); - + /* Probe a list of addresses for an HP LAN+ adaptor. This routine is almost boilerplate. */ @@ -430,7 +430,7 @@ hpp_mem_block_output(struct net_device *dev, int count, return; } - + #ifdef MODULE #define MAX_HPP_CARDS 4 /* Max number of HPP cards per module */ static struct net_device *dev_hpp[MAX_HPP_CARDS]; |