diff options
author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-13 16:29:25 +0000 |
commit | db7d4daea91e105e3859cf461d7e53b9b77454b2 (patch) | |
tree | 9bb65b95440af09e8aca63abe56970dd3360cc57 /arch/i386/config.in | |
parent | 9c1c01ead627bdda9211c9abd5b758d6c687d8ac (diff) |
Merge with Linux 2.2.8.
Diffstat (limited to 'arch/i386/config.in')
-rw-r--r-- | arch/i386/config.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/i386/config.in b/arch/i386/config.in index 3c42052e4..65a3aee0a 100644 --- a/arch/i386/config.in +++ b/arch/i386/config.in @@ -158,7 +158,7 @@ fi endmenu mainmenu_option next_comment -comment 'CD-ROM drivers (not for SCSI or IDE/ATAPI drives)' +comment 'Old CD-ROM drivers (not SCSI, not IDE)' bool 'Support non-SCSI/IDE/ATAPI CDROM drives' CONFIG_CD_NO_IDESCSI if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then @@ -168,6 +168,8 @@ endmenu source drivers/char/Config.in +# source drivers/usb/Config.in + source fs/Config.in if [ "$CONFIG_VT" = "y" ]; then |