packages: kernel/kernel-multiarch.config - sort config: ./kernel-config-sor...
arekm
arekm at pld-linux.org
Tue Jul 21 15:15:35 CEST 2009
Author: arekm Date: Tue Jul 21 13:15:35 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- sort config: ./kernel-config-sort.pl ~/rpm/BUILD/kernel-2.6.30.2/linux-2.6.30 kernel-multiarch.config
---- Files affected:
packages/kernel:
kernel-multiarch.config (1.10 -> 1.11)
---- Diffs:
================================================================
Index: packages/kernel/kernel-multiarch.config
diff -u packages/kernel/kernel-multiarch.config:1.10 packages/kernel/kernel-multiarch.config:1.11
--- packages/kernel/kernel-multiarch.config:1.10 Tue Jul 21 09:45:26 2009
+++ packages/kernel/kernel-multiarch.config Tue Jul 21 15:15:29 2009
@@ -4,7 +4,6 @@
#-
BLOCK all=y
LBD all=y
-BLK_DEV_IO_TRACE all=n
BLK_DEV_BSG all=y
BLK_DEV_INTEGRITY all=y
#- file block/Kconfig.iosched goes here
@@ -95,9 +94,8 @@
CRYPTO_TWOFISH_X86_64 x86_64=m
#- Compression
CRYPTO_DEFLATE all=m
-CRYPTO_LZO all=m
CRYPTO_ZLIB all=m
-
+CRYPTO_LZO all=m
#- Random Number Generation
CRYPTO_ANSI_CPRNG all=m
#- file drivers/crypto/Kconfig goes here
@@ -454,6 +452,7 @@
#- *** FILE: drivers/char/hw_random/Kconfig ***
#-
HW_RANDOM all=m alpha=y i386=y sparc64=y
+HW_RANDOM_TIMERIOMEM all=m
HW_RANDOM_INTEL all=m
HW_RANDOM_AMD i386=m x86_64=m
HW_RANDOM_GEODE i386=m x86_64=m
@@ -461,7 +460,6 @@
HW_RANDOM_VIA i386=m
HW_RANDOM_PASEMI ppc64=m
HW_RANDOM_VIRTIO=m
-HW_RANDOM_TIMERIOMEM all=m
#-
#- *** FILE: drivers/char/ipmi/Kconfig ***
@@ -638,16 +636,14 @@
HID all=m
HID_DEBUG all=n
HIDRAW all=y
-
#- file drivers/hid/usbhid/Kconfig goes here
-HID_COMPAT all=n
+DRAGONRISE_FF all=m
LOGITECH_FF all=y
LOGIRUMBLEPAD2_FF all=y
PANTHERLORD_FF all=y
GREENASIA_FF all=m
THRUSTMASTER_FF all=m
ZEROPLUS_FF all=m
-DRAGONRISE_FF all=m
#-
#- *** FILE: drivers/hid/usbhid/Kconfig ***
@@ -686,13 +682,8 @@
SENSORS_AMS_I2C ppc=y
SENSORS_ASB100 all=m
SENSORS_ATK0110 all=m
-SENSORS_G760A all=m
-SENSORS_LTC4215 all=m
-SENSORS_LM95241 all=m
-SENSORS_SHT15 all=m
SENSORS_ATXP1 all=m
SENSORS_DS1621 all=m
-SENSORS_LIS3_SPI ppc=m
SENSORS_I5K_AMB all=m
SENSORS_F71805F all=m
SENSORS_F71882FG all=m
@@ -700,6 +691,7 @@
SENSORS_FSCHER all=m
SENSORS_FSCPOS all=m
SENSORS_FSCHMD all=m
+SENSORS_G760A all=m
SENSORS_GL518SM all=m
SENSORS_GL520SM all=m
SENSORS_CORETEMP all=m
@@ -718,12 +710,16 @@
SENSORS_LM90 all=m
SENSORS_LM92 all=m
SENSORS_LM93 all=m
+SENSORS_LTC4215 all=m
SENSORS_LTC4245 all=m
+SENSORS_LM95241 all=m
SENSORS_MAX1111 all=m
SENSORS_MAX1619 all=m
SENSORS_MAX6650 all=m
SENSORS_PC87360 all=m
SENSORS_PC87427 all=m
+SENSORS_PCF8591 all=m
+SENSORS_SHT15 all=m
SENSORS_SIS5595 all=m
SENSORS_DME1737 all=m
SENSORS_SMSC47M1 all=m
@@ -744,6 +740,7 @@
SENSORS_W83627EHF all=m
SENSORS_HDAPS all=m
SENSORS_LIS3LV02D all=m
+SENSORS_LIS3_SPI ppc=m
SENSORS_APPLESMC all=m
HWMON_DEBUG_CHIP all=n
@@ -823,7 +820,6 @@
SENSORS_PCF8574 all=m
PCF8575 all=m
SENSORS_PCA9539 all=m
-SENSORS_PCF8591 all=m
SENSORS_MAX6875 all=m
SENSORS_TSL2550 all=m
@@ -892,7 +888,6 @@
#* BLK_DEV_IDE_PMAC could be 'm' but it fails to build with PMAC_MEDIABAY=y
BLK_DEV_IDE_PMAC ppc=y ppc64=y
BLK_DEV_IDE_PMAC_ATA100FIRST ppc=y ppc64=y
-IDE_ARM all=n
#- Other IDE chipsets support
#- Note: most of these also require special kernel boot parameters
BLK_DEV_4DRIVES alpha=m i386=m
@@ -1307,19 +1302,20 @@
LEDS_GPIO_OF ppc=y
LEDS_LP5521 all=m
LEDS_CLEVO_MAIL all=m
-LEDS_DAC124S085 all=m
-LEDS_BD2802 all=m
LEDS_PCA955X all=m
LEDS_WM8350 all=m
LEDS_DA903X all=m
+LEDS_DAC124S085 all=m
+LEDS_BD2802 all=m
#- LED Triggers
LEDS_TRIGGERS all=y
LEDS_TRIGGER_TIMER all=m
LEDS_TRIGGER_IDE_DISK all=y
LEDS_TRIGGER_HEARTBEAT all=m
LEDS_TRIGGER_BACKLIGHT all=m
-LEDS_TRIGGER_DEFAULT_ON all=m
LEDS_TRIGGER_GPIO all=m
+LEDS_TRIGGER_DEFAULT_ON all=m
+#- iptables trigger is under Netfilter config (LED target)
#-
#- *** FILE: drivers/lguest/Kconfig ***
@@ -1366,7 +1362,6 @@
MD_RAID1 all=m
MD_RAID10 all=m
MD_RAID456 all=m
-MD_RAID5_RESHAPE all=y
MD_MULTIPATH all=m
MD_FAULTY all=m
BLK_DEV_DM all=m
@@ -1458,7 +1453,6 @@
DVB_USB all=m
DVB_USB_DEBUG all=n
DVB_USB_A800 all=m
-DVB_USB_CE6230 all=m
DVB_USB_DIBUSB_MB all=m
DVB_USB_DIBUSB_MB_FAULTY all=n
DVB_USB_DIBUSB_MC all=m
@@ -1483,6 +1477,7 @@
DVB_USB_ANYSEE all=m
DVB_USB_DTV5100 all=m
DVB_USB_AF9015 all=m
+DVB_USB_CE6230 all=m
#-
#- *** FILE: drivers/media/dvb/firewire/Kconfig ***
@@ -1564,7 +1559,6 @@
#- *** FILE: drivers/media/dvb/ttpci/Kconfig ***
#-
DVB_AV7110 all=m sparc=n
-DVB_AV7110_FIRMWARE all=n
DVB_AV7110_OSD all=y
DVB_BUDGET_CORE all=m
DVB_BUDGET all=m sparc=n
@@ -1631,14 +1625,14 @@
VIDEO_WM8775 all=m
VIDEO_WM8739 all=m
VIDEO_VP27SMPX ia64=m
+#- RDS decoders
+VIDEO_SAA6588 all=m
#- Video decoders
VIDEO_BT819 all=m
VIDEO_BT856 all=m
VIDEO_KS0127 all=m
VIDEO_OV7670 all=m
VIDEO_SAA7110 all=m
-VIDEO_SAA7111 all=m
-VIDEO_SAA7114 all=m
VIDEO_SAA711X all=m
VIDEO_TVP5150 all=m
VIDEO_VPX3220 all=m
@@ -1656,7 +1650,6 @@
VIDEO_UPD64083 all=m
VIDEO_VIVI all=m
#- file drivers/media/video/bt8xx/Kconfig goes here
-VIDEO_SAA6588 all=m
VIDEO_PMS all=m
VIDEO_BWQCAM all=m
VIDEO_CQCAM all=m
@@ -1682,11 +1675,9 @@
VIDEO_CAFE_CCIC all=m sparc=n
SOC_CAMERA all=m
SOC_CAMERA_MT9M001 all=m
-MT9M001_PCA9536_SWITCH all=y
SOC_CAMERA_MT9M111 all=m
SOC_CAMERA_MT9T031 all=m
SOC_CAMERA_MT9V022 all=m
-MT9V022_PCA9536_SWITCH all=y
SOC_CAMERA_TW9910 all=m
SOC_CAMERA_PLATFORM all=m
SOC_CAMERA_OV772X all=m
@@ -1695,7 +1686,9 @@
#- file drivers/media/video/uvc/Kconfig goes here
#- file drivers/media/video/gspca/Kconfig goes here
#- file drivers/media/video/pvrusb2/Kconfig goes here
+#- file drivers/media/video/hdpvr/Kconfig goes here
#- file drivers/media/video/em28xx/Kconfig goes here
+#- file drivers/media/video/cx231xx/Kconfig goes here
#- file drivers/media/video/usbvision/Kconfig goes here
#- file drivers/media/video/usbvideo/Kconfig goes here
#- file drivers/media/video/et61x251/Kconfig goes here
@@ -1733,6 +1726,13 @@
VIDEO_CX18 all=m sparc=n
#-
+#- *** FILE: drivers/media/video/cx231xx/Kconfig ***
+#-
+VIDEO_CX231XX all=m
+VIDEO_CX231XX_ALSA all=m
+VIDEO_CX231XX_DVB all=m
+
+#-
#- *** FILE: drivers/media/video/cx23885/Kconfig ***
#-
VIDEO_CX23885 all=m sparc=n
@@ -1771,11 +1771,9 @@
#- file drivers/media/video/gspca/stv06xx/Kconfig goes here
USB_GSPCA_CONEX all=m
USB_GSPCA_ETOMS all=m
-USB_GSPCA_MR97310A all=m
-USB_GSPCA_SQ905 all=m
-USB_GSPCA_SQ905C all=m
USB_GSPCA_FINEPIX all=m
USB_GSPCA_MARS all=m
+USB_GSPCA_MR97310A all=m
USB_GSPCA_OV519 all=m
USB_GSPCA_OV534 all=m
USB_GSPCA_PAC207 all=m
@@ -1788,6 +1786,8 @@
USB_GSPCA_SPCA506 all=m
USB_GSPCA_SPCA508 all=m
USB_GSPCA_SPCA561 all=m
+USB_GSPCA_SQ905 all=m
+USB_GSPCA_SQ905C all=m
USB_GSPCA_STK014 all=m
USB_GSPCA_SUNPLUS all=m
USB_GSPCA_T613 all=m
@@ -1806,6 +1806,11 @@
USB_STV06XX all=m
#-
+#- *** FILE: drivers/media/video/hdpvr/Kconfig ***
+#-
+VIDEO_HDPVR all=m
+
+#-
#- *** FILE: drivers/media/video/ivtv/Kconfig ***
#-
VIDEO_IVTV all=m sparc=n
@@ -1819,11 +1824,6 @@
VIDEO_PVRUSB2_DVB all=y sparc=n
VIDEO_PVRUSB2_DEBUGIFC all=n
-VIDEO_HDPVR all=m
-VIDEO_CX231XX all=m
-VIDEO_CX231XX_ALSA all=m
-VIDEO_CX231XX_DVB all=m
-
#-
#- *** FILE: drivers/media/video/pwc/Kconfig ***
#-
@@ -1960,9 +1960,7 @@
SGI_GRU ia64=m x86_64=m
SGI_GRU_DEBUG ia64=n x86_64=n
DELL_LAPTOP all=m
-DELL_WMI all=m
ISL29003 all=m
-
#- file drivers/misc/c2port/Kconfig goes here
#- file drivers/misc/eeprom/Kconfig goes here
@@ -2307,7 +2305,6 @@
E1000E all=m
IP1000 all=m
IGB all=m
-IGB_LRO all=y
IGB_DCA all=y
IGBVF all=m
#- file drivers/net/ixp2000/Kconfig goes here
@@ -2665,20 +2662,11 @@
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
-LIBERTAS_SPI all=m
AIRO all=m
-HERMES all=m
-HERMES_CACHE_FW_ON_INIT all=y
-APPLE_AIRPORT ppc=m ppc64=m
-PLX_HERMES all=m
-TMD_HERMES all=m
-NORTEL_HERMES all=m
-PCI_HERMES all=m
-PCMCIA_HERMES all=m
-PCMCIA_SPECTRUM all=m
ATMEL all=m
PCI_ATMEL all=m
PCMCIA_ATMEL all=m
@@ -2696,6 +2684,7 @@
#- file drivers/net/wireless/p54/Kconfig goes here
#- file drivers/net/wireless/ath5k/Kconfig goes here
#- file drivers/net/wireless/ath9k/Kconfig goes here
+#- file drivers/net/wireless/ar9170/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
@@ -2703,6 +2692,12 @@
#- 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/orinoco/Kconfig goes here
+
+#-
+#- *** FILE: drivers/net/wireless/ar9170/Kconfig ***
+#-
+AR9170_USB all=m
#-
#- *** FILE: drivers/net/wireless/ath5k/Kconfig ***
@@ -2716,8 +2711,6 @@
ATH9K all=m
ATH9K_DEBUG all=n
-AR9170_USB all=m
-
#-
#- *** FILE: drivers/net/wireless/b43/Kconfig ***
#-
@@ -2761,22 +2754,29 @@
#-
#- *** FILE: drivers/net/wireless/iwlwifi/Kconfig ***
#-
-IWLCORE all=m
IWLWIFI all=m
-IWLWIFI_RFKILL all=y
-IWLWIFI_DEBUG all=y
IWLWIFI_LEDS all=y
+IWLWIFI_RFKILL all=y
IWLWIFI_SPECTRUM_MEASUREMENT all=y
+IWLWIFI_DEBUG all=y
IWLAGN all=m
-IWLAGN_SPECTRUM_MEASUREMENT all=y
-IWLAGN_LEDS all=y
IWL4965 all=y
IWL5000 all=y
IWL3945 all=m
-IWL3945_RFKILL all=y
IWL3945_SPECTRUM_MEASUREMENT all=y
-IWL3945_LEDS all=y
-IWL3945_DEBUG all=n
+
+#-
+#- *** FILE: drivers/net/wireless/orinoco/Kconfig ***
+#-
+HERMES all=m
+HERMES_CACHE_FW_ON_INIT all=y
+APPLE_AIRPORT ppc=m ppc64=m
+PLX_HERMES all=m
+TMD_HERMES all=m
+NORTEL_HERMES all=m
+PCI_HERMES all=m
+PCMCIA_HERMES all=m
+PCMCIA_SPECTRUM all=m
#-
#- *** FILE: drivers/net/wireless/p54/Kconfig ***
@@ -2795,7 +2795,7 @@
RT61PCI all=m
RT2500USB all=m
RT73USB all=m
-#- rt2x00 rfkill support disabled due to modularized RFKILL and built-in rt2x00
+#- rt2x00 rfkill support disabled due to modularized INPUT and built-in rt2x00
#- rt2x00 leds support disabled due to modularized LEDS_CLASS and built-in rt2x00
RT2X00_DEBUG all=n
@@ -2899,6 +2899,7 @@
#-
ACER_WMI all=m
ASUS_LAPTOP i386=m x86_64=m
+DELL_WMI all=m
FUJITSU_LAPTOP all=m
FUJITSU_LAPTOP_DEBUG all=n
TC1100_WMI all=m
@@ -2911,10 +2912,10 @@
THINKPAD_ACPI i386=m x86_64=m
THINKPAD_ACPI_DEBUGFACILITIES all=n
THINKPAD_ACPI_DEBUG i386=n x86_64=n
+THINKPAD_ACPI_UNSAFE_LEDS all=n
THINKPAD_ACPI_BAY i386=y x86_64=y
THINKPAD_ACPI_VIDEO all=y
THINKPAD_ACPI_HOTKEY_POLL all=y
-THINKPAD_ACPI_UNSAFE_LEDS all=n
INTEL_MENLOW all=m
EEEPC_LAPTOP all=m
ACPI_WMI all=m
@@ -2967,6 +2968,7 @@
#-
REGULATOR all=y
REGULATOR_DEBUG all=n
+REGULATOR_FIXED_VOLTAGE all=m
REGULATOR_VIRTUAL_CONSUMER all=m
REGULATOR_BQ24022 all=m
REGULATOR_TWL4030 ppc=y
@@ -2974,7 +2976,6 @@
REGULATOR_WM8400 all=m
REGULATOR_DA903X all=m
REGULATOR_PCF50633 all=m
-REGULATOR_FIXED_VOLTAGE all=m
#-
#- *** FILE: drivers/rtc/Kconfig ***
@@ -2990,7 +2991,6 @@
RTC_INTF_DEV all=y
RTC_INTF_DEV_UIE_EMUL all=n
RTC_DRV_TEST all=m
-RTC_DRV_GENERIC ppc=y
#- I2C RTC drivers
RTC_DRV_DS1307 all=m
RTC_DRV_DS1374 all=m
@@ -3030,7 +3030,7 @@
RTC_DRV_WM8350 all=m
RTC_DRV_PCF50633 all=m
#- on-CPU RTC drivers
-RTC_DRV_PPC all=n ppc=y ppc64=y
+RTC_DRV_GENERIC ppc=y
#-
#- *** FILE: drivers/sbus/char/Kconfig ***
@@ -3066,10 +3066,6 @@
SCSI_CONSTANTS all=n
SCSI_LOGGING all=y
SCSI_SCAN_ASYNC all=y
-SCSI_OSD_INITIATOR all=m
-SCSI_OSD_ULD all=m
-SCSI_OSD_DPRINT_SENSE all=1
-SCSI_OSD_DEBUG all=n
SCSI_WAIT_SCAN all=m
SCSI_SPI_ATTRS all=m
SCSI_FC_ATTRS all=m
@@ -3100,6 +3096,7 @@
SCSI_ARCMSR all=m sparc=n
SCSI_ARCMSR_AER all=y
#- file drivers/scsi/megaraid/Kconfig.megaraid goes here
+#- file drivers/scsi/mpt2sas/Kconfig goes here
SCSI_HPTIOP all=m sparc=n
SCSI_BUSLOGIC all=m
SCSI_FLASHPOINT i386=n
@@ -3177,6 +3174,7 @@
SCSI_SRP all=m sparc=n
#- file drivers/scsi/pcmcia/Kconfig goes here
#- file drivers/scsi/device_handler/Kconfig goes here
+#- file drivers/scsi/osd/Kconfig goes here
#-
#- *** FILE: drivers/scsi/aic7xxx/Kconfig.aic79xx ***
@@ -3226,10 +3224,6 @@
SCSI_SAS_HOST_SMP all=y
SCSI_SAS_LIBSAS_DEBUG all=n
-SCSI_MPT2SAS all=m
-SCSI_MPT2SAS_MAX_SGE all=128
-SCSI_MPT2SAS_LOGGING all=y
-
#-
#- *** FILE: drivers/scsi/megaraid/Kconfig.megaraid ***
#-
@@ -3240,6 +3234,21 @@
MEGARAID_SAS all=m
#-
+#- *** FILE: drivers/scsi/mpt2sas/Kconfig ***
+#-
+SCSI_MPT2SAS all=m
+SCSI_MPT2SAS_MAX_SGE all=128
+SCSI_MPT2SAS_LOGGING all=y
+
+#-
+#- *** FILE: drivers/scsi/osd/Kconfig ***
+#-
+SCSI_OSD_INITIATOR all=m
+SCSI_OSD_ULD all=m
+SCSI_OSD_DPRINT_SENSE all=1
+SCSI_OSD_DEBUG all=n
+
+#-
#- *** FILE: drivers/scsi/pcmcia/Kconfig ***
#-
SCSI_LOWLEVEL_PCMCIA all=y ia64=n
@@ -3356,6 +3365,7 @@
#- file drivers/staging/otus/Kconfig goes here
#- file drivers/staging/rt2860/Kconfig goes here
#- file drivers/staging/rt2870/Kconfig goes here
+#- file drivers/staging/rt3070/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
@@ -3366,6 +3376,16 @@
#- file drivers/staging/frontier/Kconfig goes here
#- file drivers/staging/epl/Kconfig goes here
#- file drivers/staging/android/Kconfig goes here
+#- file drivers/staging/dst/Kconfig goes here
+#- file drivers/staging/pohmelfs/Kconfig goes here
+#- file drivers/staging/stlc45xx/Kconfig goes here
+#- file drivers/staging/uc2322/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/heci/Kconfig goes here
+#- file drivers/staging/line6/Kconfig goes here
+#- file drivers/staging/serqt_usb/Kconfig goes here
#-
#- *** FILE: drivers/staging/agnx/Kconfig ***
@@ -3398,12 +3418,23 @@
USB_ATMEL all=m
#-
+#- *** FILE: drivers/staging/b3dfg/Kconfig ***
+#-
+B3DFG all=m
+
+#-
#- *** FILE: drivers/staging/comedi/Kconfig ***
#-
COMEDI all=m ppc=n
+COMEDI_DEBUG all=n
COMEDI_PCI_DRIVERS all=m
COMEDI_USB_DRIVERS all=m
-COMEDI_DEBUG all=n
+
+#-
+#- *** FILE: drivers/staging/dst/Kconfig ***
+#-
+DST all=m
+DST_DEBUG all=n
#-
#- *** FILE: drivers/staging/echo/Kconfig ***
@@ -3415,30 +3446,6 @@
#-
EPL all=m
-
-DST all=m
-DST_DEBUG all=n
-
-POHMELFS all=m
-POHMELFS_DEBUG all=n
-POHMELFS_CRYPTO all=y
-
-STLC45XX all=m
-
-USB_SERIAL_ATEN2011 all=m
-
-B3DFG all=m
-
-IDE_PHISON all=m
-
-PLAN9AUTH all=m
-
-HECI all=m
-
-LINE6_USB all=m
-
-USB_SERIAL_QUATECH_ESU100 all=m
-
#-
#- *** FILE: drivers/staging/et131x/Kconfig ***
#-
@@ -3458,6 +3465,16 @@
VIDEO_GO7007_USB_S2250_BOARD all=m
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.10&r2=1.11&f=u
More information about the pld-cvs-commit
mailing list