SOURCES (LINUX_2_6): kernel-x86_64-smp.config, kernel-x86_64.confi...
pluto
pluto at pld-linux.org
Fri Oct 7 15:59:07 CEST 2005
Author: pluto Date: Fri Oct 7 13:59:07 2005 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- merged from ix86.
---- Files affected:
SOURCES:
kernel-x86_64-smp.config (1.1.2.95 -> 1.1.2.96) , kernel-x86_64.config (1.1.2.95 -> 1.1.2.96)
---- Diffs:
================================================================
Index: SOURCES/kernel-x86_64-smp.config
diff -u SOURCES/kernel-x86_64-smp.config:1.1.2.95 SOURCES/kernel-x86_64-smp.config:1.1.2.96
--- SOURCES/kernel-x86_64-smp.config:1.1.2.95 Fri Oct 7 14:54:35 2005
+++ SOURCES/kernel-x86_64-smp.config Fri Oct 7 15:59:01 2005
@@ -1,8 +1,3 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.13-0.0.1smp
-# Fri Sep 2 23:33:39 2005
-#
CONFIG_X86_64=y
CONFIG_64BIT=y
CONFIG_X86=y
@@ -2744,3 +2739,92 @@
CONFIG_TEXTSEARCH=y
CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_FSM=m
+
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_SATA_MV=m
+CONFIG_FUSION_SAS=m
+
+CONFIG_PHYLIB=m
+CONFIG_PHYCONTROL=y
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+
+CONFIG_FUSE_FS=m
+CONFIG_RELAYFS_FS=m
+CONFIG_9P_FS=m
+
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_INET_DIAG=m
+CONFIG_IP_DCCP=m
+CONFIG_IP_DCCP_CCID3=m
+# CONFIG_IP_DCCP_DEBUG is not set
+# CONFIG_IP_DCCP_UNLOAD_HACK is not set
+CONFIG_CONNECTOR=m
+# CONFIG_CASSINI is not set
+CONFIG_ULI526X=m
+CONFIG_SIS190=m
+CONFIG_CHELSIO_T1=m
+CONFIG_IBMASR=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_W1_DS2433=m
+CONFIG_W1_DS2433_CRC=y
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_HDAPS=m
+CONFIG_VIDEO_SAA6588=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_FB_I810_I2C=y
+CONFIG_FB_CYBLA=m
+CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
+CONFIG_SND_AD1889=m
+# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
+CONFIG_USB_STORAGE_ONETOUCH=y
+CONFIG_USB_YEALINK=m
+CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+# CONFIG_DETECT_SOFTLOCKUP is not set
+CONFIG_CRC16=m
+
+CONFIG_DIGIEPCA=m
+CONFIG_MKISS=m
================================================================
Index: SOURCES/kernel-x86_64.config
diff -u SOURCES/kernel-x86_64.config:1.1.2.95 SOURCES/kernel-x86_64.config:1.1.2.96
--- SOURCES/kernel-x86_64.config:1.1.2.95 Fri Oct 7 14:54:35 2005
+++ SOURCES/kernel-x86_64.config Fri Oct 7 15:59:02 2005
@@ -1,6 +1,3 @@
-#
-# Linux kernel version: 2.6.13
-#
CONFIG_X86_64=y
CONFIG_64BIT=y
CONFIG_X86=y
@@ -2653,3 +2650,91 @@
CONFIG_TEXTSEARCH=y
CONFIG_TEXTSEARCH_KMP=m
CONFIG_TEXTSEARCH_FSM=m
+
+CONFIG_IEEE80211=m
+# CONFIG_IEEE80211_DEBUG is not set
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_SATA_MV=m
+CONFIG_FUSION_SAS=m
+
+CONFIG_PHYLIB=m
+CONFIG_PHYCONTROL=y
+CONFIG_MARVELL_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_CICADA_PHY=m
+
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+
+CONFIG_FUSE_FS=m
+CONFIG_RELAYFS_FS=m
+CONFIG_9P_FS=m
+
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_DELL_RBU=m
+CONFIG_DCDBAS=m
+CONFIG_INET_DIAG=m
+CONFIG_IP_DCCP=m
+CONFIG_IP_DCCP_CCID3=m
+# CONFIG_IP_DCCP_DEBUG is not set
+# CONFIG_IP_DCCP_UNLOAD_HACK is not set
+CONFIG_CONNECTOR=m
+# CONFIG_CASSINI is not set
+CONFIG_ULI526X=m
+CONFIG_SIS190=m
+CONFIG_CHELSIO_T1=m
+CONFIG_IBMASR=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_SBC8360_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_DRM_SAVAGE=m
+CONFIG_W1_DS2433=m
+CONFIG_W1_DS2433_CRC=y
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_HDAPS=m
+CONFIG_VIDEO_SAA6588=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_FB_I810_I2C=y
+CONFIG_FB_CYBLA=m
+CONFIG_SND_SEQ_RTCTIMER_DEFAULT=y
+CONFIG_SND_AD1889=m
+# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
+CONFIG_USB_STORAGE_ONETOUCH=y
+CONFIG_USB_YEALINK=m
+CONFIG_USB_APPLETOUCH=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+# CONFIG_USB_EPSON2888 is not set
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+# CONFIG_DETECT_SOFTLOCKUP is not set
+CONFIG_CRC16=m
+
+CONFIG_DIGIEPCA=m
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/kernel-x86_64-smp.config?r1=1.1.2.95&r2=1.1.2.96&f=u
http://cvs.pld-linux.org/SOURCES/kernel-x86_64.config?r1=1.1.2.95&r2=1.1.2.96&f=u
More information about the pld-cvs-commit
mailing list