packages: kernel/kernel-multiarch.config, kernel/kernel-x86.config - sort c...
arekm
arekm at pld-linux.org
Fri Feb 26 00:13:09 CET 2010
Author: arekm Date: Thu Feb 25 23:13:09 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- sort configs
---- Files affected:
packages/kernel:
kernel-multiarch.config (1.35 -> 1.36) , kernel-x86.config (1.21 -> 1.22)
---- Diffs:
================================================================
Index: packages/kernel/kernel-multiarch.config
diff -u packages/kernel/kernel-multiarch.config:1.35 packages/kernel/kernel-multiarch.config:1.36
--- packages/kernel/kernel-multiarch.config:1.35 Fri Feb 26 00:09:39 2010
+++ packages/kernel/kernel-multiarch.config Fri Feb 26 00:13:04 2010
@@ -12,12 +12,9 @@
#- *** FILE: block/Kconfig.iosched ***
#-
IOSCHED_NOOP all=y
-IOSCHED_AS all=y
IOSCHED_DEADLINE all=y
IOSCHED_CFQ all=y
CFQ_GROUP_IOSCHED all=y
-# DEBUG_CFQ_IOSCHED is not set
-DEFAULT_AS all=n
DEFAULT_DEADLINE all=n
DEFAULT_CFQ all=y
DEFAULT_NOOP all=n
@@ -204,6 +201,7 @@
PATA_OPTI all=m sparc=n
PATA_OPTIDMA all=m sparc=n
PATA_PCMCIA all=m
+PATA_PDC2027X all=m sparc=n
PATA_PDC_OLD all=m sparc=n
PATA_QDI alpha=m i386=m
PATA_RADISYS all=m sparc=n
@@ -211,7 +209,6 @@
PATA_RZ1000 all=m sparc=n
PATA_SC1200 all=m sparc=n
PATA_SERVERWORKS all=m sparc=n
-PATA_PDC2027X all=m sparc=n
PATA_SIL680 all=m sparc=n
PATA_SIS all=m sparc=n
PATA_VIA all=m sparc=n
@@ -297,6 +294,7 @@
BLK_DEV_COW_COMMON all=n
BLK_DEV_LOOP all=m
BLK_DEV_CRYPTOLOOP all=n
+#- file drivers/block/drbd/Kconfig goes here
BLK_DEV_NBD all=m
BLK_DEV_OSD all=m
BLK_DEV_SX8 all=m
@@ -375,7 +373,6 @@
CYCLADES all=m
CYZ_INTR all=n
DIGIEPCA all=m
-ESPSERIAL alpha=m i386=m
MOXA_INTELLIO all=m
MOXA_SMARTIO all=m
ISI all=m
@@ -598,11 +595,12 @@
#- *** FILE: drivers/firewire/Kconfig ***
#-
#- You can enable one or both FireWire driver stacks.
-#- See the help texts for more information.
+#- The newer stack is recommended.
FIREWIRE all=n ia64=m ppc=m ppc64=m x86_64=m
FIREWIRE_OHCI all=m
FIREWIRE_SBP2 all=m
FIREWIRE_NET all=m
+#- file drivers/ieee1394/Kconfig goes here
#-
#- *** FILE: drivers/firmware/Kconfig ***
@@ -648,6 +646,7 @@
DRM_TDFX all=m
DRM_R128 all=m
DRM_RADEON all=m
+#- file drivers/gpu/drm/radeon/Kconfig goes here
DRM_I810 i386=m x86_64=m
DRM_I830 i386=m x86_64=m
DRM_I915 i386=m x86_64=m
@@ -843,8 +842,6 @@
I2C_PARPORT_LIGHT all=m
I2C_TAOS_EVM all=m
I2C_TINY_USB all=m
-#- Graphics adapter I2C/DDC channel drivers
-I2C_VOODOO3 all=m
#- Other I2C/SMBus bus drivers
I2C_ELEKTOR i386=m
I2C_PCA_ISA all=m
@@ -858,7 +855,6 @@
#-
#- *** FILE: drivers/i2c/chips/Kconfig ***
#-
-DS1682 all=m
SENSORS_TSL2550 all=m
#-
@@ -943,7 +939,6 @@
#-
#- *** FILE: drivers/ieee1394/Kconfig ***
#-
-#- file drivers/firewire/Kconfig goes here
IEEE1394 all=m sparc=n
IEEE1394_OHCI1394 all=m sparc=
#- PCILynx controller requires I2C
@@ -1468,6 +1463,11 @@
DM_UEVENT all=y
#-
+#- *** FILE: drivers/media/IR/Kconfig ***
+#-
+VIDEO_IR all=m sparc=
+
+#-
#- *** FILE: drivers/media/Kconfig ***
#-
MEDIA_SUPPORT all=m
@@ -1479,6 +1479,7 @@
DVB_CORE all=m
#- Multimedia drivers
#- file drivers/media/common/Kconfig goes here
+#- file drivers/media/IR/Kconfig goes here
#- file drivers/media/common/tuners/Kconfig goes here
#- file drivers/media/video/Kconfig goes here
#- file drivers/media/radio/Kconfig goes here
@@ -1523,6 +1524,8 @@
#- file drivers/media/dvb/firewire/Kconfig goes here
#- Supported Earthsoft PT1 Adapters
#- file drivers/media/dvb/pt1/Kconfig goes here
+#- Supported Mantis Adapters
+#- file drivers/media/dvb/mantis/Kconfig goes here
#- Supported DVB Frontends
#- file drivers/media/dvb/frontends/Kconfig goes here
@@ -1718,7 +1721,6 @@
VIDEO_V4L2 all=m
VIDEO_V4L1 all=m
VIDEO_BTCX all=m sparc=
-VIDEO_IR all=m sparc=
VIDEO_TVEEPROM all=m
VIDEO_TUNER all=m sparc=
VIDEO_CAPTURE_DRIVERS all=y
@@ -2091,11 +2093,12 @@
HP_ILO all=m
SGI_GRU ia64=m x86_64=m
SGI_GRU_DEBUG ia64=n x86_64=n
-DELL_LAPTOP all=m
ISL29003 all=m
+DS1682 all=m
#- file drivers/misc/c2port/Kconfig goes here
#- file drivers/misc/eeprom/Kconfig goes here
#- file drivers/misc/cb710/Kconfig goes here
+#- file drivers/misc/iwmc3200top/Kconfig goes here
#-
#- *** FILE: drivers/misc/c2port/Kconfig ***
@@ -2446,6 +2449,7 @@
ATL2 all=m
XILINX_EMACLITE powerpc=m
#- file drivers/net/fs_enet/Kconfig goes here
+#- file drivers/net/octeon/Kconfig goes here
NETDEV_1000 all=y
ACENIC all=m sparc=n
ACENIC_OMIT_TIGON_I all=n
@@ -2588,6 +2592,7 @@
CAN_VCAN all=m
CAN_DEV all=m
CAN_CALC_BITTIMING all=y
+#- file drivers/net/can/mscan/Kconfig goes here
#- file drivers/net/can/sja1000/Kconfig goes here
#- file drivers/net/can/usb/Kconfig goes here
CAN_DEBUG_DEVICES all=n
@@ -2826,20 +2831,7 @@
#- *** FILE: drivers/net/wireless/Kconfig ***
#-
WLAN all=y
-WLAN_PRE80211 all=y ppc=n ppc64=n
-STRIP all=m
-ARLAN i386=m
-WAVELAN alpha=m i386=m
-PCMCIA_WAVELAN all=m
-PCMCIA_NETWAVE all=m
-WLAN_80211 all=y
PCMCIA_RAYCS all=m
-LIBERTAS all=m
-LIBERTAS_USB all=m sparc=
-LIBERTAS_CS all=m
-LIBERTAS_SDIO all=m
-LIBERTAS_SPI all=m
-LIBERTAS_DEBUG all=n
LIBERTAS_THINFIRM all=m
LIBERTAS_THINFIRM_USB all=m
AIRO all=m
@@ -2857,18 +2849,19 @@
ADM8211 all=m
MAC80211_HWSIM all=m
MWL8K all=m
-#- file drivers/net/wireless/p54/Kconfig goes here
#- file drivers/net/wireless/ath/Kconfig goes here
-#- file drivers/net/wireless/ipw2x00/Kconfig goes here
-#- file drivers/net/wireless/iwlwifi/Kconfig goes here
-#- file drivers/net/wireless/hostap/Kconfig goes here
#- file drivers/net/wireless/b43/Kconfig goes here
#- file drivers/net/wireless/b43legacy/Kconfig goes here
-#- file drivers/net/wireless/zd1211rw/Kconfig goes here
-#- file drivers/net/wireless/rt2x00/Kconfig goes here
+#- file drivers/net/wireless/hostap/Kconfig goes here
+#- file drivers/net/wireless/ipw2x00/Kconfig goes here
+#- file drivers/net/wireless/iwlwifi/Kconfig goes here
+#- file drivers/net/wireless/iwmc3200wifi/Kconfig goes here
+#- file drivers/net/wireless/libertas/Kconfig goes here
#- file drivers/net/wireless/orinoco/Kconfig goes here
+#- file drivers/net/wireless/p54/Kconfig goes here
+#- file drivers/net/wireless/rt2x00/Kconfig goes here
#- file drivers/net/wireless/wl12xx/Kconfig goes here
-#- file drivers/net/wireless/iwmc3200wifi/Kconfig goes here
+#- file drivers/net/wireless/zd1211rw/Kconfig goes here
#-
#- *** FILE: drivers/net/wireless/ath/Kconfig ***
@@ -2893,7 +2886,6 @@
#- *** FILE: drivers/net/wireless/ath/ath9k/Kconfig ***
#-
ATH9K all=m
-ATH9K_DEBUG all=n
#-
#- *** FILE: drivers/net/wireless/b43/Kconfig ***
@@ -2941,7 +2933,6 @@
#- *** FILE: drivers/net/wireless/iwlwifi/Kconfig ***
#-
IWLWIFI all=m
-IWLWIFI_LEDS all=y
IWLWIFI_SPECTRUM_MEASUREMENT all=y
IWLWIFI_DEBUG all=y
IWLAGN all=m
@@ -2957,6 +2948,16 @@
IWM_DEBUG all=n
#-
+#- *** FILE: drivers/net/wireless/libertas/Kconfig ***
+#-
+LIBERTAS all=m
+LIBERTAS_USB all=m sparc=
+LIBERTAS_CS all=m
+LIBERTAS_SDIO all=m
+LIBERTAS_SPI all=m
+LIBERTAS_DEBUG all=n
+
+#-
#- *** FILE: drivers/net/wireless/orinoco/Kconfig ***
#-
HERMES all=m
@@ -3081,7 +3082,6 @@
#- *** FILE: drivers/pcmcia/Kconfig ***
#-
PCCARD all=m
-PCMCIA_DEBUG all=n
PCMCIA all=m
PCMCIA_LOAD_CIS all=y
PCMCIA_IOCTL all=y ppc=n ppc64=n x86_64=n
@@ -3097,6 +3097,7 @@
I82092 all=m
I82365 alpha=m i386=m
TCIC alpha=m i386=m
+PCMCIA_DEBUG all=n
PCMCIA_PROBE alpha=y i386=y
ELECTRA_CF ppc64=m
PCCARD_NONSTATIC all=m
@@ -3107,6 +3108,7 @@
X86_PLATFORM_DEVICES i386=y x86_64=y
ACER_WMI all=m
ASUS_LAPTOP i386=m x86_64=m
+DELL_LAPTOP all=m
DELL_WMI all=m
FUJITSU_LAPTOP all=m
FUJITSU_LAPTOP_DEBUG all=n
@@ -3620,25 +3622,24 @@
#- file drivers/staging/otus/Kconfig goes here
#- file drivers/staging/rt2860/Kconfig goes here
#- file drivers/staging/rt2870/Kconfig goes here
-#- file drivers/staging/rt3090/Kconfig goes here
#- file drivers/staging/comedi/Kconfig goes here
#- file drivers/staging/asus_oled/Kconfig goes here
#- file drivers/staging/panel/Kconfig goes here
#- file drivers/staging/altpciechdma/Kconfig goes here
#- file drivers/staging/rtl8187se/Kconfig goes here
#- file drivers/staging/rtl8192su/Kconfig goes here
+#- file drivers/staging/rtl8192u/Kconfig goes here
#- file drivers/staging/rtl8192e/Kconfig goes here
#- file drivers/staging/mimio/Kconfig goes here
#- file drivers/staging/frontier/Kconfig goes here
-#- file drivers/staging/android/Kconfig goes here
#- file drivers/staging/dream/Kconfig goes here
-#- file drivers/staging/dst/Kconfig goes here
#- file drivers/staging/pohmelfs/Kconfig goes here
#- file drivers/staging/b3dfg/Kconfig goes here
#- file drivers/staging/phison/Kconfig goes here
#- file drivers/staging/p9auth/Kconfig goes here
#- file drivers/staging/line6/Kconfig goes here
-#- file drivers/gpu/drm/radeon/Kconfig goes here
+#- file drivers/gpu/drm/vmwgfx/Kconfig goes here
+#- file drivers/gpu/drm/nouveau/Kconfig goes here
#- file drivers/staging/octeon/Kconfig goes here
#- file drivers/staging/serqt_usb2/Kconfig goes here
#- file drivers/staging/quatech_usb2/Kconfig goes here
@@ -3650,6 +3651,16 @@
#- file drivers/staging/rar/Kconfig goes here
#- file drivers/staging/sep/Kconfig goes here
#- file drivers/staging/iio/Kconfig goes here
+#- file drivers/staging/ramzswap/Kconfig goes here
+#- file drivers/staging/wlags49_h2/Kconfig goes here
+#- file drivers/staging/wlags49_h25/Kconfig goes here
+#- file drivers/staging/batman-adv/Kconfig goes here
+#- file drivers/staging/samsung-laptop/Kconfig goes here
+#- file drivers/staging/strip/Kconfig goes here
+#- file drivers/staging/arlan/Kconfig goes here
+#- file drivers/staging/wavelan/Kconfig goes here
+#- file drivers/staging/netwave/Kconfig goes here
+#- file drivers/staging/sm7xx/Kconfig goes here
#-
#- *** FILE: drivers/staging/altpciechdma/Kconfig ***
@@ -3657,14 +3668,9 @@
ALTERA_PCIE_CHDMA all=m
#-
-#- *** FILE: drivers/staging/android/Kconfig ***
+#- *** FILE: drivers/staging/arlan/Kconfig ***
#-
-ANDROID all=n
-ANDROID_BINDER_IPC all=n
-ANDROID_LOGGER all=n
-ANDROID_RAM_CONSOLE all=n
-ANDROID_TIMED_GPIO all=n
-ANDROID_LOW_MEMORY_KILLER all=n
+ARLAN i386=m
#-
#- *** FILE: drivers/staging/asus_oled/Kconfig ***
@@ -3699,12 +3705,6 @@
INPUT_GPIO all=m
#-
-#- *** FILE: drivers/staging/dst/Kconfig ***
-#-
-DST all=m
-DST_DEBUG all=n
-
-#-
#- *** FILE: drivers/staging/echo/Kconfig ***
#-
ECHO all=m
@@ -3769,12 +3769,6 @@
MAX1363 all=m
#-
-#- *** FILE: drivers/staging/iio/light/Kconfig ***
-#-
-#- Light sensors
-TSL2561 all=m
-
-#-
#- *** FILE: drivers/staging/iio/trigger/Kconfig ***
#-
#- Triggers - standalone
@@ -3792,6 +3786,11 @@
INPUT_MIMIO all=m
#-
+#- *** FILE: drivers/staging/netwave/Kconfig ***
+#-
+PCMCIA_NETWAVE all=m
+
+#-
#- *** FILE: drivers/staging/otus/Kconfig ***
#-
OTUS all=m
@@ -3847,16 +3846,6 @@
RT2870 all=m
#-
-#- *** FILE: drivers/staging/rt3090/Kconfig ***
-#-
-RT3090 all=m
-
-#-
-#- *** FILE: drivers/staging/rtl8187se/Kconfig ***
-#-
-RTL8187SE all=m
-
-#-
#- *** FILE: drivers/staging/rtl8192e/Kconfig ***
#-
RTL8192E all=m
@@ -3882,6 +3871,11 @@
SLICOSS all=m
#-
+#- *** FILE: drivers/staging/strip/Kconfig ***
+#-
+STRIP all=m
+
+#-
#- *** FILE: drivers/staging/udlfb/Kconfig ***
#-
FB_UDL all=m
@@ -3924,6 +3918,12 @@
VT6656 all=m
#-
+#- *** FILE: drivers/staging/wavelan/Kconfig ***
+#-
+WAVELAN alpha=m i386=m
+PCMCIA_WAVELAN all=m
+
+#-
#- *** FILE: drivers/staging/winbond/Kconfig ***
#-
W35UND all=m
@@ -4373,6 +4373,7 @@
FB_MB862XX_PCI_GDC all=y
FB_BROADSHEET all=m
#- file drivers/video/omap/Kconfig goes here
+#- file drivers/video/omap2/Kconfig goes here
#- file drivers/video/backlight/Kconfig goes here
#- file drivers/video/display/Kconfig goes here
#- file drivers/video/console/Kconfig goes here
@@ -4551,6 +4552,7 @@
#- file fs/jbd2/Kconfig goes here
FS_MBCACHE all=m
#- file fs/reiserfs/Kconfig goes here
+#- file fs/reiser4/Kconfig goes here
#- file fs/jfs/Kconfig goes here
FS_POSIX_ACL all=y
#- file fs/xfs/Kconfig goes here
@@ -4581,6 +4583,7 @@
#- file fs/adfs/Kconfig goes here
#- file fs/affs/Kconfig goes here
#- file fs/ecryptfs/Kconfig goes here
+#- file fs/unionfs/Kconfig goes here
#- file fs/hfs/Kconfig goes here
#- file fs/hfsplus/Kconfig goes here
#- file fs/befs/Kconfig goes here
@@ -4968,7 +4971,6 @@
OCFS2_FS_STATS all=y
OCFS2_DEBUG_MASKLOG all=y
OCFS2_DEBUG_FS all=n
-OCFS2_FS_POSIX_ACL all=n
#-
#- *** FILE: fs/omfs/Kconfig ***
@@ -5194,6 +5196,7 @@
MODULE_SRCVERSION_ALL all=n
STOP_MACHINE all=y
#- file block/Kconfig goes here
+#- file kernel/Kconfig.locks goes here
#-
#- *** FILE: kernel/Kconfig.hz ***
@@ -5909,6 +5912,7 @@
#-
#- *** FILE: net/wireless/Kconfig ***
#-
+WIRELESS_EXT all=y
CFG80211 all=m sparc=n
NL80211_TESTMODE all=y
CFG80211_DEVELOPER_WARNINGS all=n
@@ -5916,7 +5920,6 @@
CFG80211_DEFAULT_PS all=y
CFG80211_DEBUGFS all=n
WIRELESS_OLD_REGULATORY all=y
-WIRELESS_EXT all=y
WIRELESS_EXT_SYSFS all=y
LIB80211 all=m
LIB80211_DEBUG all=n
@@ -5951,11 +5954,11 @@
SECURITY_NETWORK all=y
SECURITY_NETWORK_XFRM all=y
SECURITY_PATH all=y
-SECURITY_FILE_CAPABILITIES all=y
LSM_MMAP_MIN_ADDR all=0 x86_64=65536 i386=65536 sparc64=8192 ppc=65536
#- file security/selinux/Kconfig goes here
#- file security/smack/Kconfig goes here
#- file security/tomoyo/Kconfig goes here
+#- file security/apparmor/Kconfig goes here
#- file security/integrity/ima/Kconfig goes here
#-
@@ -6135,7 +6138,6 @@
SOUND_OSS all=m
SOUND_TRACEINIT all=y i386=n x86_64=n
SOUND_DMAP all=n
-SOUND_SSCAPE all=m
SOUND_VMIDI all=m
SOUND_TRIX all=m x86_64=n
SOUND_MSS all=m x86_64=n
@@ -6336,3 +6338,29 @@
INITRAMFS_COMPRESSION_GZIP all=n
INITRAMFS_COMPRESSION_BZIP2 all=n
INITRAMFS_COMPRESSION_LZMA all=n
+
+#-
+#- *** PROBABLY REMOVED OPTIONS ***
+#-
+ANDROID all=n
+ANDROID_BINDER_IPC all=n
+ANDROID_LOGGER all=n
+ANDROID_LOW_MEMORY_KILLER all=n
+ANDROID_RAM_CONSOLE all=n
+ANDROID_TIMED_GPIO all=n
+ATH9K_DEBUG all=n
+DEFAULT_AS all=n
+DST all=m
+DST_DEBUG all=n
+ESPSERIAL alpha=m i386=m
+I2C_VOODOO3 all=m
+IOSCHED_AS all=y
+IWLWIFI_LEDS all=y
+OCFS2_FS_POSIX_ACL all=n
+RT3090 all=m
+RTL8187SE all=m
+SECURITY_FILE_CAPABILITIES all=y
+SOUND_SSCAPE all=m
+TSL2561 all=m
+WLAN_80211 all=y
+WLAN_PRE80211 all=y ppc=n ppc64=n
================================================================
Index: packages/kernel/kernel-x86.config
diff -u packages/kernel/kernel-x86.config:1.21 packages/kernel/kernel-x86.config:1.22
--- packages/kernel/kernel-x86.config:1.21 Fri Dec 4 22:49:30 2009
+++ packages/kernel/kernel-x86.config Fri Feb 26 00:13:04 2010
@@ -65,7 +65,6 @@
MICROCODE_AMD x86=y
X86_MSR x86=m
X86_CPUID x86=m
-X86_CPU_DEBUG x86=m
NOHIGHMEM i386=n
HIGHMEM4G i386=y
HIGHMEM64G i386=n
@@ -139,6 +138,7 @@
#- file drivers/firmware/Kconfig goes here
#- file fs/Kconfig goes here
#- file arch/x86/Kconfig.debug goes here
+#- file kernel/vserver/Kconfig goes here
#- file security/Kconfig goes here
#- file crypto/Kconfig goes here
#- file arch/x86/kvm/Kconfig goes here
@@ -241,3 +241,8 @@
#- *** FILE: arch/x86/xen/Kconfig ***
#-
XEN i386=n
+
+#-
+#- *** PROBABLY REMOVED OPTIONS ***
+#-
+X86_CPU_DEBUG x86=m
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.35&r2=1.36&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-x86.config?r1=1.21&r2=1.22&f=u
More information about the pld-cvs-commit
mailing list