diff options
| author | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
|---|---|---|
| committer | Miguel de Icaza <miguel@nuclecu.unam.mx> | 1997-08-06 19:14:48 +0000 |
| commit | e2819e52a162873ff5061de81bb749831bdb5de9 (patch) | |
| tree | 6067ea700202750ba335a423696f2972700e5f76 /init | |
| parent | 17a005074429bbf143e40401f405ae4363e56828 (diff) | |
Merge to 2.1.38.
IMPORTANT NOTE: I could not figure out what information is the
one that should be used for the following files (ie, those
that were in our tree, or those that came from Linus' patch),
please, check these:
include/asm-mips/jazz.h
include/asm-mips/jazzdma.h
include/asm-mips/ioctls.h
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/main.c b/init/main.c index 45211f11b..659f86b2e 100644 --- a/init/main.c +++ b/init/main.c @@ -218,7 +218,7 @@ extern void sm_setup(char *str, int *ints); #ifdef CONFIG_WDT extern void wdt_setup(char *str, int *ints); #endif -#ifdef CONFIG_PNP_PARPORT +#ifdef CONFIG_PARPORT extern void parport_setup(char *str, int *ints); #endif #ifdef CONFIG_PLIP @@ -522,7 +522,7 @@ struct { #ifdef CONFIG_WDT { "wdt=", wdt_setup }, #endif -#ifdef CONFIG_PNP_PARPORT +#ifdef CONFIG_PARPORT { "parport=", parport_setup }, #endif #ifdef CONFIG_PLIP |