diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-06-10 16:01:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-06-10 16:01:08 +0000 |
| commit | 9a493792f424f0bdac8c2b7626e7f2c0b928d2d3 (patch) | |
| tree | 4082622d6d695f6a0bd7c640da29e9095c91cdf5 | |
| parent | 657a501e22e2bebcfb67dc076d38d5f47af9cfda (diff) | |
Fix config buglet which made some options unavailable on certain
machines.
| -rw-r--r-- | arch/mips/config.in | 7 | ||||
| -rw-r--r-- | arch/mips/defconfig | 55 | ||||
| -rw-r--r-- | arch/mips/defconfig-decstation | 55 | ||||
| -rw-r--r-- | arch/mips/defconfig-ip22 | 55 |
4 files changed, 167 insertions, 5 deletions
diff --git a/arch/mips/config.in b/arch/mips/config.in index 46e59d9e1..6ff06908c 100644 --- a/arch/mips/config.in +++ b/arch/mips/config.in @@ -390,12 +390,9 @@ if [ "$CONFIG_CD_NO_IDESCSI" != "n" ]; then fi endmenu -if [ "$CONFIG_DECSTATION" != "y" -a \ - "$CONFIG_SGI_IP22" != "y" ]; then - source drivers/char/Config.in +source drivers/char/Config.in - source drivers/media/Config.in -fi +source drivers/media/Config.in if [ "$CONFIG_DECSTATION" = "y" ]; then mainmenu_option next_comment diff --git a/arch/mips/defconfig b/arch/mips/defconfig index d0ac0802b..47087701a 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig @@ -319,6 +319,61 @@ CONFIG_SGISEEQ=y # CONFIG_CD_NO_IDESCSI is not set # +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +# CONFIG_SERIAL is not set +# CONFIG_SERIAL_EXTENDED is not set +# CONFIG_SERIAL_NONSTANDARD is not set +CONFIG_UNIX98_PTYS=y +CONFIG_UNIX98_PTY_COUNT=256 + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set +# CONFIG_MOUSE is not set + +# +# Joysticks +# +# CONFIG_JOYSTICK is not set + +# +# Input core support is needed for joysticks +# +# CONFIG_QIC02_TAPE is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_INTEL_RNG is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# # SGI Character devices # CONFIG_VT=y diff --git a/arch/mips/defconfig-decstation b/arch/mips/defconfig-decstation index 640647952..e720e8a5a 100644 --- a/arch/mips/defconfig-decstation +++ b/arch/mips/defconfig-decstation @@ -310,6 +310,61 @@ CONFIG_DECLANCE=y # CONFIG_CD_NO_IDESCSI is not set # +# Character devices +# +# CONFIG_VT is not set +CONFIG_SERIAL=y +CONFIG_SERIAL_CONSOLE=y +# CONFIG_SERIAL_EXTENDED is not set +# CONFIG_SERIAL_NONSTANDARD is not set +CONFIG_UNIX98_PTYS=y +CONFIG_UNIX98_PTY_COUNT=256 + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set +# CONFIG_MOUSE is not set + +# +# Joysticks +# +# CONFIG_JOYSTICK is not set + +# +# Input core support is needed for joysticks +# +# CONFIG_QIC02_TAPE is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_INTEL_RNG is not set +# CONFIG_NVRAM is not set +CONFIG_RTC=y +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# # DECStation Character devices # # CONFIG_VT is not set diff --git a/arch/mips/defconfig-ip22 b/arch/mips/defconfig-ip22 index d0ac0802b..47087701a 100644 --- a/arch/mips/defconfig-ip22 +++ b/arch/mips/defconfig-ip22 @@ -319,6 +319,61 @@ CONFIG_SGISEEQ=y # CONFIG_CD_NO_IDESCSI is not set # +# Character devices +# +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +# CONFIG_SERIAL is not set +# CONFIG_SERIAL_EXTENDED is not set +# CONFIG_SERIAL_NONSTANDARD is not set +CONFIG_UNIX98_PTYS=y +CONFIG_UNIX98_PTY_COUNT=256 + +# +# I2C support +# +# CONFIG_I2C is not set + +# +# Mice +# +# CONFIG_BUSMOUSE is not set +# CONFIG_MOUSE is not set + +# +# Joysticks +# +# CONFIG_JOYSTICK is not set + +# +# Input core support is needed for joysticks +# +# CONFIG_QIC02_TAPE is not set + +# +# Watchdog Cards +# +# CONFIG_WATCHDOG is not set +# CONFIG_INTEL_RNG is not set +# CONFIG_NVRAM is not set +# CONFIG_RTC is not set +# CONFIG_DTLK is not set +# CONFIG_R3964 is not set +# CONFIG_APPLICOM is not set + +# +# Ftape, the floppy tape device driver +# +# CONFIG_FTAPE is not set +# CONFIG_AGP is not set +# CONFIG_DRM is not set + +# +# Multimedia devices +# +# CONFIG_VIDEO_DEV is not set + +# # SGI Character devices # CONFIG_VT=y |