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/i386/config.in | |
parent | 511bcd7c5924ce9e98ad1cb851988f7448dfef0f (diff) |
Merge with Linux 2.3.24.
Diffstat (limited to 'arch/i386/config.in')
-rw-r--r-- | arch/i386/config.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/config.in b/arch/i386/config.in index b8f081e65..47b2fce5a 100644 --- a/arch/i386/config.in +++ b/arch/i386/config.in @@ -125,7 +125,6 @@ fi endmenu -source drivers/i2o/Config.in source drivers/pnp/Config.in @@ -145,6 +144,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' |