Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 37972
b: refs/heads/master
c: 2c81fbc
h: refs/heads/master
v: v3
  • Loading branch information
Jeff Garzik committed Oct 1, 2006
1 parent 1b6632a commit 908f457
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: de897881e474cae06cf06c830fcadc916c53ce64
refs/heads/master: 2c81fbc4cfc895e80c18fffdc04a3d870eb16cb8
5 changes: 3 additions & 2 deletions trunk/drivers/net/hp100.c
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,12 @@ struct hp100_private {
/*
* variables
*/
#ifndef MODULE
static const char *hp100_isa_tbl[] = {
"HWPF150", /* HP J2573 rev A */
"HWP1950", /* HP J2573 */
};
#endif

#ifdef CONFIG_EISA
static struct eisa_device_id hp100_eisa_tbl[] = {
Expand Down Expand Up @@ -333,6 +335,7 @@ static __devinit const char *hp100_read_id(int ioaddr)
return str;
}

#ifndef MODULE
static __init int hp100_isa_probe1(struct net_device *dev, int ioaddr)
{
const char *sig;
Expand Down Expand Up @@ -391,8 +394,6 @@ static int __init hp100_isa_probe(struct net_device *dev, int addr)
return err;
}


#ifndef MODULE
struct net_device * __init hp100_probe(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private));
Expand Down

0 comments on commit 908f457

Please sign in to comment.