diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 23:45:22 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 23:45:22 +0000 |
| commit | 5b35aa5cd29bb111d847b2a2ed18110acbfb1f44 (patch) | |
| tree | c7bbaa1137528330d3c74d14056ef7016a52be72 /arch/mips/config.in | |
| parent | 511bcd7c5924ce9e98ad1cb851988f7448dfef0f (diff) | |
Merge with Linux 2.3.24.
Diffstat (limited to 'arch/mips/config.in')
| -rw-r--r-- | arch/mips/config.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/config.in b/arch/mips/config.in index 9fc20b48e..14256b262 100644 --- a/arch/mips/config.in +++ b/arch/mips/config.in @@ -1,4 +1,4 @@ -# $Id: config.in,v 1.34 2000/01/23 21:12:56 ralf Exp $ +# $Id: config.in,v 1.35 2000/01/26 00:07:44 ralf Exp $ # For a description of the syntax of this configuration file, # see the Configure script. # @@ -150,8 +150,6 @@ if [ "$CONFIG_DECSTATION" = "y" ]; then endmenu fi -source drivers/i2o/Config.in - source drivers/pnp/Config.in source drivers/block/Config.in @@ -196,6 +194,8 @@ if [ "$CONFIG_SCSI" != "n" ]; then fi endmenu +source drivers/i2o/Config.in + if [ "$CONFIG_NET" = "y" ]; then mainmenu_option next_comment comment 'Network device support' |