-update to 2.2.20

Changed files:
    kernel-i386-smp.config -> 1.29
    kernel-i686-smp.config -> 1.52

diff --git a/kernel-i386-smp.config b/kernel-i386-smp.config
index 24a3c217194ce2b27476536e4f88c3ea78c40cc8..1463f5274cbc4999327a829550576c10808faab6 100644 (file)
--- a/kernel-i386-smp.config
+++ b/kernel-i386-smp.config
@@ -53,6 +53,7 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_SYSCTL=y
 CONFIG_BINFMT_AOUT=m
 CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_ELF_AOUT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_JAVA=m
 CONFIG_PARPORT=m
@@ -131,7 +132,10 @@ CONFIG_BLK_DEV_SIS5513=y
 CONFIG_BLK_DEV_SLC90E66=y
 CONFIG_BLK_DEV_OSB4=y
 CONFIG_BLK_DEV_TRM290=y
-CONFIG_BLK_DEV_VIA82CXXX=n
+CONFIG_BLK_DEV_VIA82CXXX=y
+CONFIG_BLK_DEV_NS87415=y
+CONFIG_BLK_DEV_VIA82C586=y
+CONFIG_BLK_DEV_CMD646=y
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_BLK_DEV_LOOP=m
@@ -250,6 +254,7 @@ CONFIG_IPX=m
 CONFIG_SPX=m
 CONFIG_ATALK=m
 CONFIG_BRIDGE=m
+CONFIG_BRIDGE_NUM_PORTS=8
 CONFIG_X25=m
 CONFIG_LAPB=m
 # CONFIG_NET_DIVERT is not set
@@ -458,6 +463,7 @@ CONFIG_NI52=m
 CONFIG_NI65=m
 CONFIG_RTL8139=m
 CONFIG_RTL8139TOO=m
+CONFIG_8139TOO_8129=y
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 CONFIG_NET_ISA=y
@@ -865,6 +871,7 @@ CONFIG_NVRAM=m
 CONFIG_RTC=y
 # CONFIG_INTEL_RNG is not set
 CONFIG_AGP=m
+CONFIG_AGPSWORKS=y
 CONFIG_AGP_INTEL=y
 CONFIG_AGP_I810=y
 CONFIG_AGP_VIA=y
@@ -965,6 +972,7 @@ CONFIG_USB_DABUSB=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_PLUSB=m
 CONFIG_USB_PEGASUS=m
+CONFIG_HOTPLUG=y
 
 #
 # USB Serial Converter support
@@ -976,6 +984,8 @@ CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_MCT_U232=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m

diff --git a/kernel-i686-smp.config b/kernel-i686-smp.config
index f3c2a3f174008762eb2d0eeeb786a5f472ab0d58..45c8dfe53209b7c32a9b1823a600142187182f4d 100644 (file)
--- a/kernel-i686-smp.config
+++ b/kernel-i686-smp.config
@@ -59,6 +59,7 @@ CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_SYSCTL=y
 CONFIG_BINFMT_AOUT=m
 CONFIG_BINFMT_ELF=y
+CONFIG_BINFMT_ELF_AOUT=y
 CONFIG_BINFMT_MISC=m
 CONFIG_BINFMT_JAVA=m
 CONFIG_PARPORT=m
@@ -137,7 +138,10 @@ CONFIG_BLK_DEV_SIS5513=y
 CONFIG_BLK_DEV_SLC90E66=y
 CONFIG_BLK_DEV_OSB4=y
 CONFIG_BLK_DEV_TRM290=y
-CONFIG_BLK_DEV_VIA82CXXX=n
+CONFIG_BLK_DEV_VIA82CXXX=y
+CONFIG_BLK_DEV_NS87415=y
+CONFIG_BLK_DEV_VIA82C586=y
+CONFIG_BLK_DEV_CMD646=y
 # CONFIG_IDE_CHIPSETS is not set
 # CONFIG_IDEDMA_IVB is not set
 CONFIG_BLK_DEV_LOOP=m
@@ -256,6 +260,7 @@ CONFIG_IPX=m
 CONFIG_SPX=m
 CONFIG_ATALK=m
 CONFIG_BRIDGE=m
+CONFIG_BRIDGE_NUM_PORTS=8
 CONFIG_X25=m
 CONFIG_LAPB=m
 # CONFIG_NET_DIVERT is not set
@@ -464,6 +469,7 @@ CONFIG_NI52=m
 CONFIG_NI65=m
 CONFIG_RTL8139=m
 CONFIG_RTL8139TOO=m
+CONFIG_8139TOO_8129=y
 # CONFIG_8139TOO_PIO is not set
 # CONFIG_8139TOO_TUNE_TWISTER is not set
 CONFIG_NET_ISA=y
@@ -871,6 +877,7 @@ CONFIG_NVRAM=m
 CONFIG_RTC=y
 # CONFIG_INTEL_RNG is not set
 CONFIG_AGP=m
+CONFIG_AGPSWORKS=y
 CONFIG_AGP_INTEL=y
 CONFIG_AGP_I810=y
 CONFIG_AGP_VIA=y
@@ -971,6 +978,7 @@ CONFIG_USB_DABUSB=m
 CONFIG_USB_KAWETH=m
 CONFIG_USB_PLUSB=m
 CONFIG_USB_PEGASUS=m
+CONFIG_HOTPLUG=y
 
 #
 # USB Serial Converter support
@@ -982,6 +990,8 @@ CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_MCT_U232=m
 CONFIG_USB_SERIAL_FTDI_SIO=m
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m