Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 07:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

[netdrvr] hp100: encapsulate all non-module code

Browse Source 
The previous '#ifndef MODULE' block did not cover all the
static-build-only code.  Now it does.

Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Jeff Garzik 2006-10-01 07:32:20 -04:00
parent de897881e4
commit 2c81fbc4cf
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/hp100.c
View File

@ -188,10 +188,12 @@ struct hp100_private {
/* /*
* variables * variables
*/ */
#ifndef MODULE
static const char *hp100_isa_tbl[] = { static const char *hp100_isa_tbl[] = {
"HWPF150", /* HP J2573 rev A */ "HWPF150", /* HP J2573 rev A */
"HWP1950", /* HP J2573 */ "HWP1950", /* HP J2573 */
}; };
#endif
#ifdef CONFIG_EISA #ifdef CONFIG_EISA
static struct eisa_device_id hp100_eisa_tbl[] = { static struct eisa_device_id hp100_eisa_tbl[] = {
@ -333,6 +335,7 @@ static __devinit const char *hp100_read_id(int ioaddr)
return str; return str;
} }
#ifndef MODULE
static __init int hp100_isa_probe1(struct net_device *dev, int ioaddr) static __init int hp100_isa_probe1(struct net_device *dev, int ioaddr)
{ {
const char *sig; const char *sig;
@ -391,8 +394,6 @@ static int __init hp100_isa_probe(struct net_device *dev, int addr)
return err; return err;
} }
#ifndef MODULE
struct net_device * __init hp100_probe(int unit) struct net_device * __init hp100_probe(int unit)
{ {
struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private)); struct net_device *dev = alloc_etherdev(sizeof(struct hp100_private));