diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-07-29 03:58:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-07-29 03:58:24 +0000 |
| commit | 1c5c0c934f91fbce2825acbb849e98781e774c1d (patch) | |
| tree | 12b5ae03516d4103bc070e4579ae1f7f71c27d24 /arch/mips/defconfig | |
| parent | 4fe70c31de87823ac9e804f4795589ba74dc6971 (diff) | |
Merge with 2.1.47. Some more cleanup and module fixes.
Diffstat (limited to 'arch/mips/defconfig')
| -rw-r--r-- | arch/mips/defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/defconfig b/arch/mips/defconfig index aec1c97bf..b1892eba6 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig @@ -38,7 +38,7 @@ CONFIG_BINFMT_ELF=y CONFIG_NET=y CONFIG_SYSVIPC=y CONFIG_SYSCTL=y -# CONFIG_PNP_PARPORT is not set +# CONFIG_PARPORT is not set # # Loadable module support @@ -133,6 +133,7 @@ CONFIG_PCNET32=y # CONFIG_NET_POCKET is not set # CONFIG_FDDI is not set # CONFIG_DLCI is not set +# CONFIG_PLIP is not set # CONFIG_PPP is not set # CONFIG_NET_RADIO is not set # CONFIG_SLIP is not set |