- we _do_ need serial console support

Changed files:
    kernel-i386-BOOT.config -> 1.35
    kernel-i386-smp.config -> 1.18
    kernel-i386.config -> 1.40
    kernel-i586-smp.config -> 1.37
    kernel-i586.config -> 1.38
    kernel-i686-smp.config -> 1.41
    kernel-i686.config -> 1.43

diff --git a/kernel-i386-BOOT.config b/kernel-i386-BOOT.config
index 5f012acd643a6c778f31aa0000d5b6aecb9305bd..cbfed6d5dd08b30d1506bbfcc6041de9c62b7967 100644 (file)
--- a/kernel-i386-BOOT.config
+++ b/kernel-i386-BOOT.config
@@ -43,7 +43,7 @@ CONFIG_PCI_BIOS=y
 CONFIG_PCI_DIRECT=y
 CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_OPTIMIZE is not set
-CONFIG_PCI_OLD_PROC=y
+# CONFIG_PCI_OLD_PROC is not set
 # CONFIG_MCA is not set
 # CONFIG_VISWS is not set
 # CONFIG_SYSVIPC is not set
@@ -94,7 +94,7 @@ CONFIG_BLK_DEV_IDE=y
 # CONFIG_BLK_DEV_HD_IDE is not set
 CONFIG_BLK_DEV_IDEDISK=y
 # CONFIG_IDEDISK_MULTI_MODE is not set
-# CONFIG_IDEDISK_STROKE is not set
+CONFIG_IDEDISK_STROKE=y
 CONFIG_BLK_DEV_IDECD=y
 # CONFIG_BLK_DEV_IDETAPE is not set
 CONFIG_BLK_DEV_IDEFLOPPY=m
@@ -122,7 +122,7 @@ CONFIG_BLK_DEV_SIS5513=y
 CONFIG_BLK_DEV_SLC90E66=y
 CONFIG_BLK_DEV_VIA82CXXX=y
 # CONFIG_IDE_CHIPSETS is not set
-CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_LOOP_USE_REL_BLOCK=y
 CONFIG_BLK_DEV_LOOP_GEN_SEL="m"
 CONFIG_BLK_DEV_LOOP_GEN=m
@@ -230,8 +230,8 @@ CONFIG_IPSEC_DEBUG=y
 #
 # Telephony Support
 #
-CONFIG_PHONE=m
-CONFIG_PHONE_IXJ=m
+# CONFIG_PHONE is not set
+# CONFIG_PHONE_IXJ is not set
 
 #
 # SCSI support
@@ -444,10 +444,7 @@ CONFIG_SLIP=m
 CONFIG_SLIP_COMPRESSED=y
 CONFIG_SLIP_SMART=y
 CONFIG_SLIP_MODE_SLIP6=y
-CONFIG_NET_RADIO=y
-CONFIG_STRIP=m
-CONFIG_WAVELAN=m
-CONFIG_ARLAN=m
+# CONFIG_NET_RADIO is not set
 
 #
 # Token ring devices
@@ -661,62 +658,19 @@ CONFIG_PRINTER_READBACK=y
 #
 # Joysticks
 #
-CONFIG_JOYSTICK=m
-CONFIG_JOY_ANALOG=m
-CONFIG_JOY_ASSASSIN=m
-CONFIG_JOY_GRAVIS=m
-CONFIG_JOY_LOGITECH=m
-CONFIG_JOY_SIDEWINDER=m
-CONFIG_JOY_THRUSTMASTER=m
-CONFIG_JOY_CREATIVE=m
-CONFIG_JOY_LIGHTNING=m
-CONFIG_JOY_PCI=m
-CONFIG_JOY_MAGELLAN=m
-CONFIG_JOY_SPACEORB=m
-CONFIG_JOY_SPACEBALL=m
-CONFIG_JOY_WARRIOR=m
-CONFIG_JOY_CONSOLE=m
-CONFIG_JOY_DB9=m
-CONFIG_JOY_TURBOGRAFX=m
+# CONFIG_JOYSTICK is not set
 # CONFIG_QIC02_TAPE is not set
 # CONFIG_WATCHDOG is not set
 # CONFIG_NVRAM is not set
 # CONFIG_RTC is not set
 # CONFIG_INTEL_RNG is not set
 # CONFIG_AGP is not set
-CONFIG_DRM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_GAMMA=m
-CONFIG_DRM_R128=m
-# CONFIG_DRM_I810 is not set
-# CONFIG_DRM_MGA is not set
+# CONFIG_DRM is not set
 
 #
 # Video For Linux
 #
-CONFIG_VIDEO_DEV=m
-CONFIG_RADIO_RTRACK=m
-CONFIG_RADIO_RTRACK2=m
-CONFIG_RADIO_AZTECH=m
-CONFIG_RADIO_CADET=m
-CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_MAESTRO=m
-CONFIG_RADIO_MIROPCM20=m
-CONFIG_RADIO_TRUST=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-# CONFIG_VIDEO_CPIA_USB is not set
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_SAA5249=m
-CONFIG_RADIO_SF16FMI=m
-CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_TYPHOON_PROC_FS=y
-CONFIG_RADIO_ZOLTRIX=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_BUZ=m
+# CONFIG_VIDEO_DEV is not set
 # CONFIG_DTLK is not set
 
 #
@@ -734,7 +688,7 @@ CONFIG_USB_BANDWIDTH=y
 CONFIG_USB_UHCI=m
 CONFIG_USB_UHCI_ALT=m
 CONFIG_USB_OHCI=m
-CONFIG_USB_AUDIO=m
+# CONFIG_USB_AUDIO is not set
 CONFIG_USB_BLUETOOTH=m
 CONFIG_USB_STORAGE=m
 CONFIG_USB_STORAGE_DEBUG=y
@@ -755,9 +709,9 @@ CONFIG_USB_DC2XX=m
 CONFIG_USB_MDC800=m
 CONFIG_USB_SCANNER=m
 CONFIG_USB_MICROTEK=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_OV511=m
-CONFIG_USB_DSBR=m
+# CONFIG_USB_IBMCAM is not set
+# CONFIG_USB_OV511 is not set
+# CONFIG_USB_DSBR is not set
 CONFIG_USB_DABUSB=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_PLUSB=m
@@ -790,7 +744,7 @@ CONFIG_USB_RIO500=m
 # Filesystems
 #
 # CONFIG_QUOTA is not set
-CONFIG_AUTOFS_FS=m
+# CONFIG_AUTOFS_FS is not set
 CONFIG_REISERFS_FS=m
 # CONFIG_REISERFS_CHECK is not set
 CONFIG_ADFS_FS=m
@@ -861,7 +815,7 @@ CONFIG_NLS=y
 # Native Language Support
 #
 CONFIG_NLS_DEFAULT="cp437"
-CONFIG_NLS_CODEPAGE_437=y
+# CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_737 is not set
 # CONFIG_NLS_CODEPAGE_775 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
@@ -893,130 +847,20 @@ CONFIG_NLS_CODEPAGE_437=y
 # CONFIG_NLS_ISO8859_14 is not set
 # CONFIG_NLS_ISO8859_15 is not set
 # CONFIG_NLS_KOI8_R is not set
-CONFIG_NLS_KOI8_RU=m
+# CONFIG_NLS_KOI8_RU is not set
 
 #
 # Console drivers
 #
 CONFIG_VGA_CONSOLE=y
-CONFIG_VIDEO_SELECT=y
+# CONFIG_VIDEO_SELECT is not set
 CONFIG_MDA_CONSOLE=m
-CONFIG_FB=y
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FB_PM2=m
-CONFIG_FB_ATY=m
-CONFIG_FB_VESA=y
-# CONFIG_FB_VGA16 is not set
-CONFIG_VIDEO_SELECT=y
-CONFIG_FB_MATROX=m
-CONFIG_FB_MATROX_MILLENIUM=y
-CONFIG_FB_MATROX_MYSTIQUE=y
-CONFIG_FB_MATROX_G100=y
-CONFIG_FB_MATROX_MULTIHEAD=y
-CONFIG_FB_ATY128=m
-# CONFIG_FB_VIRTUAL is not set
-CONFIG_FBCON_ADVANCED=y
-CONFIG_FBCON_MFB=m
-CONFIG_FBCON_CFB2=m
-CONFIG_FBCON_CFB4=m
-CONFIG_FBCON_CFB8=y
-CONFIG_FBCON_CFB16=y
-CONFIG_FBCON_CFB24=y
-CONFIG_FBCON_CFB32=m
-# CONFIG_FBCON_AFB is not set
-# CONFIG_FBCON_ILBM is not set
-# CONFIG_FBCON_IPLAN2P2 is not set
-# CONFIG_FBCON_IPLAN2P4 is not set
-# CONFIG_FBCON_IPLAN2P8 is not set
-# CONFIG_FBCON_MAC is not set
-# CONFIG_FBCON_VGA_PLANES is not set
-CONFIG_FBCON_VGA=m
-# CONFIG_FBCON_FONTWIDTH8_ONLY is not set
-CONFIG_FBCON_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
+# CONFIG_FB is not set
 
 #
 # Sound
 #
-CONFIG_SOUND=m
-CONFIG_SOUND_CMPCI=m
-CONFIG_SOUND_CMPCI_FM=y
-CONFIG_SOUND_CMPCI_MIDI=y
-CONFIG_SOUND_CS4281=m
-CONFIG_SOUND_FUSION=m
-CONFIG_SOUND_EMU10K1=m
-CONFIG_SOUND_ES1370=m
-CONFIG_SOUND_ES1371=m
-CONFIG_SOUND_MAESTRO=m
-CONFIG_SOUND_MAESTRO3=m
-CONFIG_SOUND_ESSSOLO1=m
-CONFIG_SOUND_ICH=m
-CONFIG_SOUND_SONICVIBES=m
-CONFIG_SOUND_TRIDENT=m
-CONFIG_SOUND_MSNDCLAS=m
-# CONFIG_MSNDCLAS_HAVE_BOOT is not set
-CONFIG_MSNDCLAS_INIT_FILE="/etc/sound/msndinit.bin"
-CONFIG_MSNDCLAS_PERM_FILE="/etc/sound/msndperm.bin"
-CONFIG_SOUND_MSNDPIN=m
-# CONFIG_MSNDPIN_HAVE_BOOT is not set
-CONFIG_MSNDPIN_INIT_FILE="/etc/sound/pndspini.bin"
-CONFIG_MSNDPIN_PERM_FILE="/etc/sound/pndsperm.bin"
-CONFIG_SOUND_VIA82CXXX=m
-CONFIG_SOUND_OSS=m
-CONFIG_SOUND_PAS=m
-CONFIG_SOUND_SB=m
-CONFIG_SOUND_GUS=m
-CONFIG_GUS16=y
-CONFIG_GUSMAX=y
-CONFIG_SOUND_MPU401=m
-CONFIG_SOUND_PSS=m
-# CONFIG_PSS_MIXER is not set
-CONFIG_SOUND_MSS=m
-CONFIG_SOUND_SSCAPE=m
-CONFIG_SOUND_TRIX=m
-CONFIG_SOUND_MAD16=m
-CONFIG_MAD16_OLDCARD=y
-CONFIG_SOUND_WAVEFRONT=m
-CONFIG_SOUND_CS4232=m
-CONFIG_SOUND_OPL3SA2=m
-CONFIG_SOUND_MAUI=m
-CONFIG_SOUND_SGALAXY=m
-CONFIG_SOUND_AD1816=m
-CONFIG_SOUND_OPL3SA1=m
-CONFIG_SOUND_SOFTOSS=m
-CONFIG_SOUND_YM3812=m
-CONFIG_SOUND_VMIDI=m
-CONFIG_SOUND_UART6850=m
-CONFIG_SOUND_NM256=m
-CONFIG_SOUND_YMFPCI=m
-CONFIG_SOUND_YMFPCI_LEGACY=y
-
-#
-# Additional low level sound drivers
-#
-CONFIG_LOWLEVEL_SOUND=y
-CONFIG_ACI_MIXER=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_AWE32_SYNTH=m
-CONFIG_AEDSP16=m
-CONFIG_AEDSP16_BASE=220
-CONFIG_MPU_BASE=330
-CONFIG_SC6600=y
-CONFIG_SC6600_JOY=y
-CONFIG_SC6600_CDROM=4
-CONFIG_SC6600_CDROMBASE=0
-CONFIG_AEDSP16_SBPRO=y
-CONFIG_AEDSP16_BASE=220
-CONFIG_AEDSP16_SB_IRQ=5
-CONFIG_AEDSP16_SB_DMA=0
-CONFIG_AEDSP16_MPU401=y
-CONFIG_AEDSP16_MPU_IRQ=5
+# CONFIG_SOUND is not set
 
 #
 # Security options

diff --git a/kernel-i386-smp.config b/kernel-i386-smp.config
index 97bae5a822c089664c89b6ec09041bc610659d53..ba094879975834002d92e6c55c5f821457ec29e3 100644 (file)
--- a/kernel-i386-smp.config
+++ b/kernel-i386-smp.config
@@ -742,7 +742,8 @@ CONFIG_CDU535=m
 #
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
-CONFIG_SERIAL=m
+CONFIG_SERIAL=y
+CONFIG_SERIAL_CONSOLE=y
 CONFIG_SERIAL_EXTENDED=y
 CONFIG_SERIAL_MANY_PORTS=y
 CONFIG_SERIAL_SHARE_IRQ=y

diff --git a/kernel-i386.config b/kernel-i386.config
index 9aaf70b241580f4941143510671025f387b1f223..7caa15c339e5be1503be8b3a3f993d8d719cda62 100644 (file)
--- a/kernel-i386.config
+++ b/kernel-i386.config
@@ -747,7 +747,8 @@ CONFIG_CDU535=m
 #
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
-CONFIG_SERIAL=m
+CONFIG_SERIAL=y
+CONFIG_SERIAL_CONSOLE=y
 CONFIG_SERIAL_EXTENDED=y
 CONFIG_SERIAL_MANY_PORTS=y
 CONFIG_SERIAL_SHARE_IRQ=y

diff --git a/kernel-i586-smp.config b/kernel-i586-smp.config
index 3d7bf3902ea9e0d68ae5bf3584db47b34a78f0f7..33306b58d1a85a7e02cf16330d163713dc0a9f45 100644 (file)
--- a/kernel-i586-smp.config
+++ b/kernel-i586-smp.config
@@ -746,7 +746,8 @@ CONFIG_CDU535=m
 #
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
-CONFIG_SERIAL=m
+CONFIG_SERIAL=y
+CONFIG_SERIAL_CONSOLE=y
 CONFIG_SERIAL_EXTENDED=y
 CONFIG_SERIAL_MANY_PORTS=y
 CONFIG_SERIAL_SHARE_IRQ=y

diff --git a/kernel-i586.config b/kernel-i586.config
index 44c2da7557200bac3907f46e74e4eff70daffee1..2a6b1ddb46d0495480a61b6fb0cb065368c1ccdb 100644 (file)
--- a/kernel-i586.config
+++ b/kernel-i586.config
@@ -751,7 +751,8 @@ CONFIG_CDU535=m
 #
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
-CONFIG_SERIAL=m
+CONFIG_SERIAL=y
+CONFIG_SERIAL_CONSOLE=y
 CONFIG_SERIAL_EXTENDED=y
 CONFIG_SERIAL_MANY_PORTS=y
 CONFIG_SERIAL_SHARE_IRQ=y

diff --git a/kernel-i686-smp.config b/kernel-i686-smp.config
index c91e333f1fed41e13c2fb8e023548fcd707be7e5..8f3540c050f26ea0e7e09d55fd017ab3ac1bf58b 100644 (file)
--- a/kernel-i686-smp.config
+++ b/kernel-i686-smp.config
@@ -748,7 +748,8 @@ CONFIG_CDU535=m
 #
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
-CONFIG_SERIAL=m
+CONFIG_SERIAL=y
+CONFIG_SERIAL_CONSOLE=y
 CONFIG_SERIAL_EXTENDED=y
 CONFIG_SERIAL_MANY_PORTS=y
 CONFIG_SERIAL_SHARE_IRQ=y

diff --git a/kernel-i686.config b/kernel-i686.config
index 77cddeb6b04b199d5746764a427d3f07e0dc6d5c..75bfbab65a4299e244d75e984c88b234223836ec 100644 (file)
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -753,7 +753,8 @@ CONFIG_CDU535=m
 #
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
-CONFIG_SERIAL=m
+CONFIG_SERIAL=y
+CONFIG_SERIAL_CONSOLE=y
 CONFIG_SERIAL_EXTENDED=y
 CONFIG_SERIAL_MANY_PORTS=y
 CONFIG_SERIAL_SHARE_IRQ=y