[Demudi-commits] r455 - linux-source-2.6.11/trunk/debian/config/i386

Free Ekanayaka free-guest@costa.debian.org
Thu, 10 Mar 2005 17:52:31 +0100 

Author: free-guest
Date: 2005-03-10 17:52:28 +0100 (Thu, 10 Mar 2005)
New Revision: 455

Modified:
   linux-source-2.6.11/trunk/debian/config/i386/386
   linux-source-2.6.11/trunk/debian/config/i386/686-smp
   linux-source-2.6.11/trunk/debian/config/i386/k7
   linux-source-2.6.11/trunk/debian/config/i386/k7-smp
Log:
Reconfigured after patching the kernel source

Modified: linux-source-2.6.11/trunk/debian/config/i386/386
===================================================================
--- linux-source-2.6.11/trunk/debian/config/i386/386	2005-03-10 15:38:07 UTC (rev 454)
+++ linux-source-2.6.11/trunk/debian/config/i386/386	2005-03-10 16:52:28 UTC (rev 455)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.11
-# Thu Mar 10 16:32:00 2005
+# Thu Mar 10 17:50:21 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -153,9 +153,11 @@
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_THERMAL=m
 CONFIG_ACPI_ASUS=m
+CONFIG_ACPI_SONY=m
 CONFIG_ACPI_IBM=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_BLACKLIST_YEAR=0
+CONFIG_ACPI_PCC=m
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_BUS=y
 CONFIG_ACPI_EC=y
@@ -484,6 +486,7 @@
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_CLOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
@@ -703,6 +706,12 @@
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLOGIC_1280_1040=y
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
 # CONFIG_SCSI_SEAGATE is not set
 CONFIG_SCSI_SIM710=m
 CONFIG_SCSI_SYM53C416=m
@@ -1311,6 +1320,7 @@
 CONFIG_B44=m
 CONFIG_FORCEDETH=m
 CONFIG_CS89x0=m
+# CONFIG_DGRS is not set
 CONFIG_EEPRO100=m
 CONFIG_E100=m
 # CONFIG_E100_NAPI is not set
@@ -1341,6 +1351,7 @@
 #
 # Ethernet (1000 Mbit)
 #
+# CONFIG_ACENIC is not set
 CONFIG_DL2K=m
 CONFIG_E1000=m
 # CONFIG_E1000_NAPI is not set
@@ -1377,6 +1388,7 @@
 CONFIG_PROTEON=m
 CONFIG_ABYSS=m
 CONFIG_MADGEMC=m
+# CONFIG_SMCTR is not set
 
 #
 # Wireless LAN (non-hamradio)
@@ -1400,6 +1412,24 @@
 #
 # Wireless 802.11b ISA/PCI cards support
 #
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT=m
+CONFIG_IEEE80211_WPA=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IPW2100=m
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2100_PROMISC=y
+# CONFIG_IPW2100_LEGACY_FW_LOAD is not set
+CONFIG_IPW2100_FS_AMILO_M7400=m
+CONFIG_IPW2200=m
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_WLAN_NG=m
+CONFIG_PRISM2=m
+CONFIG_PRISM2_USB=m
+CONFIG_ACX100=m
+CONFIG_ADM8211=m
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1523,6 +1553,7 @@
 CONFIG_PPP_SYNC_TTY=m
 CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
 CONFIG_PPPOE=m
 CONFIG_PPPOATM=m
 CONFIG_SLIP=m
@@ -1533,6 +1564,7 @@
 # CONFIG_IPHASE5526 is not set
 CONFIG_SHAPER=m
 CONFIG_NETCONSOLE=m
+CONFIG_NDISWRAPPER=m
 
 #
 # ISDN subsystem
@@ -1771,6 +1803,7 @@
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_CPAD=m
 
 #
 # Character devices
@@ -2506,6 +2539,7 @@
 #
 # USB Multimedia devices
 #
+# CONFIG_USB_DABUSB is not set
 CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=m
 CONFIG_USB_IBMCAM=m
@@ -2515,6 +2549,7 @@
 CONFIG_USB_SN9C102=m
 CONFIG_USB_STV680=m
 CONFIG_USB_W9968CF=m
+CONFIG_USB_PWC=m
 
 #
 # USB Network Adapters
@@ -2574,6 +2609,18 @@
 CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
+# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
@@ -2601,6 +2648,7 @@
 CONFIG_USB_PHIDGETSERVO=m
 # CONFIG_USB_IDMOUSE is not set
 CONFIG_USB_TEST=m
+CONFIG_USB_EAGLE=m
 
 #
 # USB ATM/DSL drivers
@@ -2895,10 +2943,11 @@
 #
 # Security options
 #
-# CONFIG_KEYS is not set
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
 CONFIG_SECURITY=y
 # CONFIG_SECURITY_NETWORK is not set
-CONFIG_SECURITY_CAPABILITIES=m
+# CONFIG_SECURITY_CAPABILITIES is not set
 CONFIG_SECURITY_ROOTPLUG=m
 CONFIG_SECURITY_SECLVL=m
 CONFIG_SECURITY_REALTIME=m

Modified: linux-source-2.6.11/trunk/debian/config/i386/686-smp
===================================================================
--- linux-source-2.6.11/trunk/debian/config/i386/686-smp	2005-03-10 15:38:07 UTC (rev 454)
+++ linux-source-2.6.11/trunk/debian/config/i386/686-smp	2005-03-10 16:52:28 UTC (rev 455)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.11
-# Thu Mar 10 16:33:18 2005
+# Thu Mar 10 17:50:47 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -167,9 +167,11 @@
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_THERMAL=m
 CONFIG_ACPI_ASUS=m
+CONFIG_ACPI_SONY=m
 CONFIG_ACPI_IBM=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_BLACKLIST_YEAR=0
+CONFIG_ACPI_PCC=m
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_BUS=y
 CONFIG_ACPI_EC=y
@@ -490,6 +492,7 @@
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_CLOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
@@ -695,6 +698,12 @@
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLOGIC_1280_1040=y
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
 # CONFIG_SCSI_SEAGATE is not set
 CONFIG_SCSI_SYM53C416=m
 CONFIG_SCSI_DC395x=m
@@ -1294,6 +1303,7 @@
 CONFIG_B44=m
 CONFIG_FORCEDETH=m
 CONFIG_CS89x0=m
+# CONFIG_DGRS is not set
 CONFIG_EEPRO100=m
 CONFIG_E100=m
 # CONFIG_E100_NAPI is not set
@@ -1321,6 +1331,7 @@
 #
 # Ethernet (1000 Mbit)
 #
+# CONFIG_ACENIC is not set
 CONFIG_DL2K=m
 CONFIG_E1000=m
 # CONFIG_E1000_NAPI is not set
@@ -1356,6 +1367,7 @@
 CONFIG_SKISA=m
 CONFIG_PROTEON=m
 CONFIG_ABYSS=m
+# CONFIG_SMCTR is not set
 
 #
 # Wireless LAN (non-hamradio)
@@ -1379,6 +1391,24 @@
 #
 # Wireless 802.11b ISA/PCI cards support
 #
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT=m
+CONFIG_IEEE80211_WPA=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IPW2100=m
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2100_PROMISC=y
+# CONFIG_IPW2100_LEGACY_FW_LOAD is not set
+CONFIG_IPW2100_FS_AMILO_M7400=m
+CONFIG_IPW2200=m
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_WLAN_NG=m
+CONFIG_PRISM2=m
+CONFIG_PRISM2_USB=m
+CONFIG_ACX100=m
+CONFIG_ADM8211=m
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1502,6 +1532,7 @@
 CONFIG_PPP_SYNC_TTY=m
 CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
 CONFIG_PPPOE=m
 CONFIG_PPPOATM=m
 CONFIG_SLIP=m
@@ -1512,6 +1543,7 @@
 # CONFIG_IPHASE5526 is not set
 CONFIG_SHAPER=m
 CONFIG_NETCONSOLE=m
+CONFIG_NDISWRAPPER=m
 
 #
 # ISDN subsystem
@@ -1747,6 +1779,7 @@
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_CPAD=m
 
 #
 # Character devices
@@ -2042,8 +2075,7 @@
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIDEO_ZR36120 is not set
 CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-# CONFIG_VIDEO_SAA7134_DVB is not set
+# CONFIG_VIDEO_SAA7134 is not set
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_DPC=m
 CONFIG_VIDEO_HEXIUM_ORION=m
@@ -2180,7 +2212,7 @@
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=m
+# CONFIG_FB_VESA is not set
 CONFIG_VIDEO_SELECT=y
 CONFIG_FB_HGA=m
 # CONFIG_FB_HGA_ACCEL is not set
@@ -2372,8 +2404,6 @@
 # Open Sound System
 #
 # CONFIG_SOUND_PRIME is not set
-# CONFIG_AEDSP16_MSS is not set
-# CONFIG_AEDSP16_SBPRO is not set
 
 #
 # USB support
@@ -2461,6 +2491,7 @@
 #
 # USB Multimedia devices
 #
+# CONFIG_USB_DABUSB is not set
 CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=m
 CONFIG_USB_IBMCAM=m
@@ -2470,6 +2501,7 @@
 CONFIG_USB_SN9C102=m
 CONFIG_USB_STV680=m
 # CONFIG_USB_W9968CF is not set
+CONFIG_USB_PWC=m
 
 #
 # USB Network Adapters
@@ -2529,6 +2561,18 @@
 CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
+# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
@@ -2556,6 +2600,7 @@
 CONFIG_USB_PHIDGETSERVO=m
 # CONFIG_USB_IDMOUSE is not set
 CONFIG_USB_TEST=m
+CONFIG_USB_EAGLE=m
 
 #
 # USB ATM/DSL drivers
@@ -2853,7 +2898,7 @@
 # CONFIG_KEYS is not set
 CONFIG_SECURITY=y
 # CONFIG_SECURITY_NETWORK is not set
-CONFIG_SECURITY_CAPABILITIES=m
+# CONFIG_SECURITY_CAPABILITIES is not set
 CONFIG_SECURITY_ROOTPLUG=m
 CONFIG_SECURITY_SECLVL=m
 CONFIG_SECURITY_REALTIME=m

Modified: linux-source-2.6.11/trunk/debian/config/i386/k7
===================================================================
--- linux-source-2.6.11/trunk/debian/config/i386/k7	2005-03-10 15:38:07 UTC (rev 454)
+++ linux-source-2.6.11/trunk/debian/config/i386/k7	2005-03-10 16:52:28 UTC (rev 455)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.11
-# Thu Mar 10 16:33:44 2005
+# Thu Mar 10 17:51:03 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -165,9 +165,11 @@
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_THERMAL=m
 CONFIG_ACPI_ASUS=m
+CONFIG_ACPI_SONY=m
 CONFIG_ACPI_IBM=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_BLACKLIST_YEAR=0
+CONFIG_ACPI_PCC=m
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_BUS=y
 CONFIG_ACPI_EC=y
@@ -489,6 +491,7 @@
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_CLOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
@@ -694,6 +697,12 @@
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLOGIC_1280_1040=y
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
 # CONFIG_SCSI_SEAGATE is not set
 CONFIG_SCSI_SYM53C416=m
 CONFIG_SCSI_DC395x=m
@@ -1294,6 +1303,7 @@
 CONFIG_B44=m
 CONFIG_FORCEDETH=m
 CONFIG_CS89x0=m
+# CONFIG_DGRS is not set
 CONFIG_EEPRO100=m
 CONFIG_E100=m
 # CONFIG_E100_NAPI is not set
@@ -1321,6 +1331,7 @@
 #
 # Ethernet (1000 Mbit)
 #
+# CONFIG_ACENIC is not set
 CONFIG_DL2K=m
 CONFIG_E1000=m
 # CONFIG_E1000_NAPI is not set
@@ -1356,6 +1367,7 @@
 CONFIG_SKISA=m
 CONFIG_PROTEON=m
 CONFIG_ABYSS=m
+# CONFIG_SMCTR is not set
 
 #
 # Wireless LAN (non-hamradio)
@@ -1379,6 +1391,24 @@
 #
 # Wireless 802.11b ISA/PCI cards support
 #
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT=m
+CONFIG_IEEE80211_WPA=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IPW2100=m
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2100_PROMISC=y
+# CONFIG_IPW2100_LEGACY_FW_LOAD is not set
+CONFIG_IPW2100_FS_AMILO_M7400=m
+CONFIG_IPW2200=m
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_WLAN_NG=m
+CONFIG_PRISM2=m
+CONFIG_PRISM2_USB=m
+CONFIG_ACX100=m
+CONFIG_ADM8211=m
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1502,6 +1532,7 @@
 CONFIG_PPP_SYNC_TTY=m
 CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
 CONFIG_PPPOE=m
 CONFIG_PPPOATM=m
 CONFIG_SLIP=m
@@ -1512,6 +1543,7 @@
 # CONFIG_IPHASE5526 is not set
 CONFIG_SHAPER=m
 CONFIG_NETCONSOLE=m
+CONFIG_NDISWRAPPER=m
 
 #
 # ISDN subsystem
@@ -1750,6 +1782,7 @@
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_CPAD=m
 
 #
 # Character devices
@@ -2069,8 +2102,7 @@
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIDEO_ZR36120 is not set
 CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-# CONFIG_VIDEO_SAA7134_DVB is not set
+# CONFIG_VIDEO_SAA7134 is not set
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_DPC=m
 CONFIG_VIDEO_HEXIUM_ORION=m
@@ -2207,7 +2239,7 @@
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=m
+# CONFIG_FB_VESA is not set
 CONFIG_VIDEO_SELECT=y
 CONFIG_FB_HGA=m
 # CONFIG_FB_HGA_ACCEL is not set
@@ -2399,8 +2431,6 @@
 # Open Sound System
 #
 # CONFIG_SOUND_PRIME is not set
-# CONFIG_AEDSP16_MSS is not set
-# CONFIG_AEDSP16_SBPRO is not set
 
 #
 # USB support
@@ -2488,6 +2518,7 @@
 #
 # USB Multimedia devices
 #
+# CONFIG_USB_DABUSB is not set
 CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=m
 CONFIG_USB_IBMCAM=m
@@ -2497,6 +2528,7 @@
 CONFIG_USB_SN9C102=m
 CONFIG_USB_STV680=m
 CONFIG_USB_W9968CF=m
+CONFIG_USB_PWC=m
 
 #
 # USB Network Adapters
@@ -2556,6 +2588,18 @@
 CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
+# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
@@ -2583,6 +2627,7 @@
 CONFIG_USB_PHIDGETSERVO=m
 # CONFIG_USB_IDMOUSE is not set
 CONFIG_USB_TEST=m
+CONFIG_USB_EAGLE=m
 
 #
 # USB ATM/DSL drivers
@@ -2880,7 +2925,7 @@
 # CONFIG_KEYS is not set
 CONFIG_SECURITY=y
 # CONFIG_SECURITY_NETWORK is not set
-CONFIG_SECURITY_CAPABILITIES=m
+# CONFIG_SECURITY_CAPABILITIES is not set
 CONFIG_SECURITY_ROOTPLUG=m
 CONFIG_SECURITY_SECLVL=m
 CONFIG_SECURITY_REALTIME=m

Modified: linux-source-2.6.11/trunk/debian/config/i386/k7-smp
===================================================================
--- linux-source-2.6.11/trunk/debian/config/i386/k7-smp	2005-03-10 15:38:07 UTC (rev 454)
+++ linux-source-2.6.11/trunk/debian/config/i386/k7-smp	2005-03-10 16:52:28 UTC (rev 455)
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.11
-# Thu Mar 10 16:34:16 2005
+# Thu Mar 10 17:51:23 2005
 #
 CONFIG_X86=y
 CONFIG_MMU=y
@@ -167,9 +167,11 @@
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_THERMAL=m
 CONFIG_ACPI_ASUS=m
+CONFIG_ACPI_SONY=m
 CONFIG_ACPI_IBM=m
 CONFIG_ACPI_TOSHIBA=m
 CONFIG_ACPI_BLACKLIST_YEAR=0
+CONFIG_ACPI_PCC=m
 # CONFIG_ACPI_DEBUG is not set
 CONFIG_ACPI_BUS=y
 CONFIG_ACPI_EC=y
@@ -490,6 +492,7 @@
 # CONFIG_BLK_DEV_COW_COMMON is not set
 CONFIG_BLK_DEV_LOOP=m
 CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_CLOOP=m
 CONFIG_BLK_DEV_NBD=m
 CONFIG_BLK_DEV_SX8=m
 # CONFIG_BLK_DEV_UB is not set
@@ -695,6 +698,12 @@
 CONFIG_SCSI_QLOGIC_FC_FIRMWARE=y
 CONFIG_SCSI_QLOGIC_1280=m
 CONFIG_SCSI_QLOGIC_1280_1040=y
+CONFIG_SCSI_QLA2XXX=m
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
 # CONFIG_SCSI_SEAGATE is not set
 CONFIG_SCSI_SYM53C416=m
 CONFIG_SCSI_DC395x=m
@@ -1294,6 +1303,7 @@
 CONFIG_B44=m
 CONFIG_FORCEDETH=m
 CONFIG_CS89x0=m
+# CONFIG_DGRS is not set
 CONFIG_EEPRO100=m
 CONFIG_E100=m
 # CONFIG_E100_NAPI is not set
@@ -1321,6 +1331,7 @@
 #
 # Ethernet (1000 Mbit)
 #
+# CONFIG_ACENIC is not set
 CONFIG_DL2K=m
 CONFIG_E1000=m
 # CONFIG_E1000_NAPI is not set
@@ -1356,6 +1367,7 @@
 CONFIG_SKISA=m
 CONFIG_PROTEON=m
 CONFIG_ABYSS=m
+# CONFIG_SMCTR is not set
 
 #
 # Wireless LAN (non-hamradio)
@@ -1379,6 +1391,24 @@
 #
 # Wireless 802.11b ISA/PCI cards support
 #
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT=m
+CONFIG_IEEE80211_WPA=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IPW2100=m
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2100_PROMISC=y
+# CONFIG_IPW2100_LEGACY_FW_LOAD is not set
+CONFIG_IPW2100_FS_AMILO_M7400=m
+CONFIG_IPW2200=m
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_WLAN_NG=m
+CONFIG_PRISM2=m
+CONFIG_PRISM2_USB=m
+CONFIG_ACX100=m
+CONFIG_ADM8211=m
 CONFIG_AIRO=m
 CONFIG_HERMES=m
 CONFIG_PLX_HERMES=m
@@ -1502,6 +1532,7 @@
 CONFIG_PPP_SYNC_TTY=m
 CONFIG_PPP_DEFLATE=m
 CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_MPPE=m
 CONFIG_PPPOE=m
 CONFIG_PPPOATM=m
 CONFIG_SLIP=m
@@ -1512,6 +1543,7 @@
 # CONFIG_IPHASE5526 is not set
 CONFIG_SHAPER=m
 CONFIG_NETCONSOLE=m
+CONFIG_NDISWRAPPER=m
 
 #
 # ISDN subsystem
@@ -1747,6 +1779,7 @@
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
+CONFIG_INPUT_CPAD=m
 
 #
 # Character devices
@@ -2042,8 +2075,7 @@
 # CONFIG_VIDEO_ZORAN is not set
 # CONFIG_VIDEO_ZR36120 is not set
 CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-# CONFIG_VIDEO_SAA7134_DVB is not set
+# CONFIG_VIDEO_SAA7134 is not set
 CONFIG_VIDEO_MXB=m
 CONFIG_VIDEO_DPC=m
 CONFIG_VIDEO_HEXIUM_ORION=m
@@ -2180,7 +2212,7 @@
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 CONFIG_FB_VGA16=m
-CONFIG_FB_VESA=m
+# CONFIG_FB_VESA is not set
 CONFIG_VIDEO_SELECT=y
 CONFIG_FB_HGA=m
 # CONFIG_FB_HGA_ACCEL is not set
@@ -2372,8 +2404,6 @@
 # Open Sound System
 #
 # CONFIG_SOUND_PRIME is not set
-# CONFIG_AEDSP16_MSS is not set
-# CONFIG_AEDSP16_SBPRO is not set
 
 #
 # USB support
@@ -2461,6 +2491,7 @@
 #
 # USB Multimedia devices
 #
+# CONFIG_USB_DABUSB is not set
 CONFIG_USB_VICAM=m
 CONFIG_USB_DSBR=m
 CONFIG_USB_IBMCAM=m
@@ -2470,6 +2501,7 @@
 CONFIG_USB_SN9C102=m
 CONFIG_USB_STV680=m
 CONFIG_USB_W9968CF=m
+CONFIG_USB_PWC=m
 
 #
 # USB Network Adapters
@@ -2529,6 +2561,18 @@
 CONFIG_USB_SERIAL_IPW=m
 CONFIG_USB_SERIAL_KEYSPAN_PDA=m
 CONFIG_USB_SERIAL_KEYSPAN=m
+# CONFIG_USB_SERIAL_KEYSPAN_MPR is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XA is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA28XB is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19 is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA18X is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QW is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA19QI is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49W is not set
+# CONFIG_USB_SERIAL_KEYSPAN_USA49WLC is not set
 CONFIG_USB_SERIAL_KLSI=m
 CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
@@ -2556,6 +2600,7 @@
 CONFIG_USB_PHIDGETSERVO=m
 # CONFIG_USB_IDMOUSE is not set
 CONFIG_USB_TEST=m
+CONFIG_USB_EAGLE=m
 
 #
 # USB ATM/DSL drivers
@@ -2853,7 +2898,7 @@
 # CONFIG_KEYS is not set
 CONFIG_SECURITY=y
 # CONFIG_SECURITY_NETWORK is not set
-CONFIG_SECURITY_CAPABILITIES=m
+# CONFIG_SECURITY_CAPABILITIES is not set
 CONFIG_SECURITY_ROOTPLUG=m
 CONFIG_SECURITY_SECLVL=m
 CONFIG_SECURITY_REALTIME=m