diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-09-28 22:25:29 +0000 |
commit | 0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch) | |
tree | 5085c389f09da78182b899d19fe1068b619a69dd /arch/mips/config.in | |
parent | 273767781288c35c9d679e908672b9996cda4c34 (diff) |
Merge with 2.3.10.
Diffstat (limited to 'arch/mips/config.in')
-rw-r--r-- | arch/mips/config.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/config.in b/arch/mips/config.in index f7fb7b2e9..9a1d95025 100644 --- a/arch/mips/config.in +++ b/arch/mips/config.in @@ -1,4 +1,4 @@ -# $Id: config.in,v 1.29 1999/08/18 23:37:42 ralf Exp $ +# $Id: config.in,v 1.30 1999/08/20 21:59:01 ralf Exp $ # For a description of the syntax of this configuration file, # see the Configure script. # @@ -123,7 +123,7 @@ bool 'BSD Process Accounting' CONFIG_BSD_PROCESS_ACCT bool 'Sysctl support' CONFIG_SYSCTL if [ "$CONFIG_SGI_IP22" != "y" -a "$CONFIG_DECSTATION" != "y" -a "$CONFIG_BAGET_MIPS" != "y" ]; then - tristate 'Parallel port support' CONFIG_PARPORT + source drivers/misc/Config.in fi endmenu |