packages: kernel/kernel-multiarch.config - config sorted for 2.6.32, no oth...

sparky sparky at pld-linux.org
Fri Dec 4 20:59:24 CET 2009


Author: sparky                       Date: Fri Dec  4 19:59:24 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- config sorted for 2.6.32, no other change introduced

---- Files affected:
packages/kernel:
   kernel-multiarch.config (1.20 -> 1.21) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-multiarch.config
diff -u packages/kernel/kernel-multiarch.config:1.20 packages/kernel/kernel-multiarch.config:1.21
--- packages/kernel/kernel-multiarch.config:1.20	Sat Oct 24 15:11:54 2009
+++ packages/kernel/kernel-multiarch.config	Fri Dec  4 20:59:18 2009
@@ -11,9 +11,9 @@
 #- *** FILE: block/Kconfig ***
 #-
 BLOCK all=y
+LBDAF i386=y
 BLK_DEV_BSG all=y
 BLK_DEV_INTEGRITY all=y
-LBDAF i386=y
 #- file block/Kconfig.iosched goes here
 
 #-
@@ -624,6 +624,7 @@
 #- SPI GPIO expanders:
 GPIO_MAX7301 all=m
 GPIO_MCP23S08 all=m
+#- AC97 GPIO expanders:
 
 #-
 #- *** FILE: drivers/gpu/drm/Kconfig ***
@@ -651,7 +652,6 @@
 #-
 HID_SUPPORT all=y
 HID all=m
-HID_DEBUG all=n
 HIDRAW all=y
 #- file drivers/hid/usbhid/Kconfig goes here
 DRAGONRISE_FF all=y
@@ -679,6 +679,8 @@
 #-
 HWMON all=m
 HWMON_VID all=m
+HWMON_DEBUG_CHIP all=n
+#- Native drivers
 SENSORS_ABITUGURU all=m
 SENSORS_ABITUGURU3 all=m
 SENSORS_AD7414 all=m
@@ -699,15 +701,12 @@
 SENSORS_AMS_PMU ppc=y
 SENSORS_AMS_I2C ppc=y
 SENSORS_ASB100 all=m
-SENSORS_ATK0110 all=m
 SENSORS_ATXP1 all=m
 SENSORS_DS1621 all=m
 SENSORS_I5K_AMB all=m
 SENSORS_F71805F all=m
 SENSORS_F71882FG all=m
 SENSORS_F75375S all=m
-SENSORS_FSCHER all=m
-SENSORS_FSCPOS all=m
 SENSORS_FSCHMD all=m
 SENSORS_G760A all=m
 SENSORS_GL518SM all=m
@@ -758,10 +757,11 @@
 SENSORS_W83627HF all=m
 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
+#- ACPI drivers
+SENSORS_ATK0110 all=m
+SENSORS_LIS3LV02D all=m
 
 #-
 #- *** FILE: drivers/i2c/Kconfig ***
@@ -806,6 +806,7 @@
 I2C_SIS96X all=m
 I2C_VIA all=m sparc=n
 I2C_VIAPRO all=m
+#- ACPI drivers
 #- Mac SMBus host controller drivers
 I2C_HYDRA ppc=m
 I2C_POWERMAC ppc=m ppc64=m
@@ -836,9 +837,6 @@
 #- *** FILE: drivers/i2c/chips/Kconfig ***
 #-
 DS1682 all=m
-SENSORS_PCF8574 all=m
-PCF8575 all=m
-SENSORS_PCA9539 all=m
 SENSORS_TSL2550 all=m
 
 #-
@@ -1210,8 +1208,8 @@
 #- *** FILE: drivers/isdn/Kconfig ***
 #-
 ISDN all=y s390=n
-#- file drivers/isdn/mISDN/Kconfig goes here
 ISDN_I4L all=n ppc=m ppc64=m
+#- file drivers/isdn/mISDN/Kconfig goes here
 #- file drivers/isdn/i4l/Kconfig goes here
 ISDN_CAPI all=m
 #- file drivers/isdn/capi/Kconfig goes here
@@ -1458,6 +1456,8 @@
 #- file drivers/media/dvb/dm1105/Kconfig goes here
 #- Supported FireWire (IEEE 1394) Adapters
 #- file drivers/media/dvb/firewire/Kconfig goes here
+#- Supported Earthsoft PT1 Adapters
+#- file drivers/media/dvb/pt1/Kconfig goes here
 #- Supported DVB Frontends
 #- file drivers/media/dvb/frontends/Kconfig goes here
 
@@ -1626,14 +1626,18 @@
 RADIO_TERRATEC alpha=m i386=m
 RADIO_TRUST alpha=m i386=m
 RADIO_TYPHOON alpha=m i386=m
-RADIO_TYPHOON_PROC_FS alpha=y i386=y
 RADIO_ZOLTRIX alpha=m i386=m
 USB_DSBR all=m
-USB_SI470X all=m
+#- file drivers/media/radio/si470x/Kconfig goes here
 USB_MR800 all=m
 RADIO_TEA5764 all=m
 
 #-
+#- *** FILE: drivers/media/radio/si470x/Kconfig ***
+#-
+USB_SI470X all=m
+
+#-
 #- *** FILE: drivers/media/video/Kconfig ***
 #-
 VIDEO_V4L2 all=m
@@ -1705,6 +1709,7 @@
 #- file drivers/media/video/au0828/Kconfig goes here
 #- file drivers/media/video/ivtv/Kconfig goes here
 #- file drivers/media/video/cx18/Kconfig goes here
+#- file drivers/media/video/saa7164/Kconfig goes here
 VIDEO_CAFE_CCIC all=m sparc=n
 SOC_CAMERA all=m
 SOC_CAMERA_MT9M001 all=m
@@ -1802,6 +1807,7 @@
 USB_GSPCA all=m
 #- file drivers/media/video/gspca/m5602/Kconfig goes here
 #- file drivers/media/video/gspca/stv06xx/Kconfig goes here
+#- file drivers/media/video/gspca/gl860/Kconfig goes here
 USB_GSPCA_CONEX all=m
 USB_GSPCA_ETOMS all=m
 USB_GSPCA_FINEPIX all=m
@@ -2067,9 +2073,9 @@
 #-
 MTD all=m
 MTD_DEBUG all=n
+MTD_TESTS all=m
 MTD_CONCAT all=m
 MTD_PARTITIONS all=y
-MTD_TESTS all=m
 MTD_REDBOOT_PARTS all=m
 MTD_REDBOOT_DIRECTORY_BLOCK all=-1
 MTD_REDBOOT_PARTS_UNALLOCATED all=y
@@ -2383,6 +2389,7 @@
 ATL1E all=m
 ATL1C all=m
 JME all=m
+#- file drivers/net/stmmac/Kconfig goes here
 NETDEV_10000 all=y
 CHELSIO_T1 all=m sparc=n
 CHELSIO_T1_1G all=y
@@ -2486,11 +2493,17 @@
 CAN_VCAN all=m
 CAN_DEV all=m
 CAN_CALC_BITTIMING all=y
+#- file drivers/net/can/sja1000/Kconfig goes here
+#- file drivers/net/can/usb/Kconfig goes here
+CAN_DEBUG_DEVICES all=n
+
+#-
+#- *** FILE: drivers/net/can/sja1000/Kconfig ***
+#-
 CAN_SJA1000 all=m
 CAN_SJA1000_PLATFORM all=m
 CAN_EMS_PCI all=m
 CAN_KVASER_PCI all=m
-CAN_DEBUG_DEVICES all=n
 
 #-
 #- *** FILE: drivers/net/hamradio/Kconfig ***
@@ -2861,7 +2874,6 @@
 RT2500USB all=m
 RT73USB all=m
 RT2800USB all=m
-#- 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
 
@@ -3167,6 +3179,7 @@
 ISCSI_TCP all=m
 #- file drivers/scsi/cxgb3i/Kconfig goes here
 #- file drivers/scsi/bnx2i/Kconfig goes here
+#- file drivers/scsi/be2iscsi/Kconfig goes here
 BLK_DEV_3W_XXXX_RAID all=m
 SCSI_3W_9XXX all=m
 SCSI_7000FASST alpha=m i386=m
@@ -3451,52 +3464,46 @@
 STAGING_EXCLUDE_BUILD all=n
 #- file drivers/staging/et131x/Kconfig goes here
 #- file drivers/staging/slicoss/Kconfig goes here
-#- file drivers/staging/sxg/Kconfig goes here
-#- file drivers/staging/me4000/Kconfig goes here
-#- file drivers/staging/meilhaus/Kconfig goes here
 #- file drivers/staging/go7007/Kconfig goes here
+#- file drivers/staging/cx25821/Kconfig goes here
 #- file drivers/staging/usbip/Kconfig goes here
 #- file drivers/staging/winbond/Kconfig goes here
 #- file drivers/staging/wlan-ng/Kconfig goes here
 #- file drivers/staging/echo/Kconfig goes here
-#- file drivers/staging/at76_usb/Kconfig goes here
 #- file drivers/staging/poch/Kconfig goes here
-#- file drivers/staging/agnx/Kconfig goes here
 #- 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/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/rspiusb/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/epl/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/stlc45xx/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/gpu/drm/radeon/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
 #- file drivers/staging/vt6655/Kconfig goes here
-#- file drivers/staging/cpc-usb/Kconfig goes here
-#- file drivers/staging/pata_rdc/Kconfig goes here
+#- file drivers/staging/vt6656/Kconfig goes here
 #- file drivers/staging/udlfb/Kconfig goes here
-
-#-
-#- *** FILE: drivers/staging/agnx/Kconfig ***
-#-
-AGNX all=m
+#- file drivers/staging/hv/Kconfig goes here
+#- file drivers/staging/vme/Kconfig goes here
+#- file drivers/staging/rar/Kconfig goes here
+#- file drivers/staging/sep/Kconfig goes here
+#- file drivers/staging/iio/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/altpciechdma/Kconfig ***
@@ -3519,11 +3526,6 @@
 ASUS_OLED all=m
 
 #-
-#- *** FILE: drivers/staging/at76_usb/Kconfig ***
-#-
-USB_ATMEL all=m
-
-#-
 #- *** FILE: drivers/staging/b3dfg/Kconfig ***
 #-
 B3DFG all=m
@@ -3538,11 +3540,6 @@
 COMEDI_USB_DRIVERS all=m
 
 #-
-#- *** FILE: drivers/staging/cpc-usb/Kconfig ***
-#-
-USB_CPC all=m
-
-#-
 #- *** FILE: drivers/staging/dst/Kconfig ***
 #-
 DST all=m
@@ -3554,11 +3551,6 @@
 ECHO all=m
 
 #-
-#- *** FILE: drivers/staging/epl/Kconfig ***
-#-
-EPL all=m
-
-#-
 #- *** FILE: drivers/staging/et131x/Kconfig ***
 #-
 ET131X all=m
@@ -3577,36 +3569,11 @@
 VIDEO_GO7007_USB_S2250_BOARD all=m
 
 #-
-#- *** FILE: drivers/staging/heci/Kconfig ***
-#-
-HECI all=m
-
-#-
 #- *** FILE: drivers/staging/line6/Kconfig ***
 #-
 LINE6_USB all=m
 
 #-
-#- *** FILE: drivers/staging/me4000/Kconfig ***
-#-
-ME4000 all=m
-
-#-
-#- *** FILE: drivers/staging/meilhaus/Kconfig ***
-#-
-MEILHAUS all=m
-ME0600 all=m
-ME0900 all=m
-ME1000 all=m
-ME1400 all=m
-ME1600 all=m
-ME4600 all=m
-ME6000 all=m
-ME8100 all=m
-ME8200 all=m
-MEDUMMY all=m
-
-#-
 #- *** FILE: drivers/staging/mimio/Kconfig ***
 #-
 INPUT_MIMIO all=m
@@ -3630,11 +3597,6 @@
 PANEL_CHANGE_MESSAGE all=n
 
 #-
-#- *** FILE: drivers/staging/pata_rdc/Kconfig ***
-#-
-RDC_17F3101X all=m
-
-#-
 #- *** FILE: drivers/staging/phison/Kconfig ***
 #-
 IDE_PHISON all=m
@@ -3662,11 +3624,6 @@
 RT2870 all=m
 
 #-
-#- *** FILE: drivers/staging/rt3070/Kconfig ***
-#-
-RT3070 all=m
-
-#-
 #- *** FILE: drivers/staging/rtl8187se/Kconfig ***
 #-
 RTL8187SE all=m
@@ -3687,16 +3644,6 @@
 SLICOSS all=m
 
 #-
-#- *** FILE: drivers/staging/stlc45xx/Kconfig ***
-#-
-STLC45XX all=m
-
-#-
-#- *** FILE: drivers/staging/sxg/Kconfig ***
-#-
-SXG all=m
-
-#-
 #- *** FILE: drivers/staging/udlfb/Kconfig ***
 #-
 FB_UDL all=m
@@ -4040,6 +3987,7 @@
 #- *** FILE: drivers/video/Kconfig ***
 #-
 #- file drivers/char/agp/Kconfig goes here
+#- file drivers/gpu/vga/Kconfig goes here
 #- file drivers/gpu/drm/Kconfig goes here
 VGASTATE all=m
 VIDEO_OUTPUT_CONTROL all=m
@@ -4111,7 +4059,6 @@
 FB_MATROX_G all=y sparc64=n
 FB_MATROX_I2C all=m
 FB_MATROX_MAVEN all=m
-FB_MATROX_MULTIHEAD all=y sparc64=n
 FB_RADEON all=m ppc=y sparc=n
 FB_RADEON_I2C all=y
 FB_RADEON_BACKLIGHT all=y
@@ -4187,7 +4134,6 @@
 VGACON_SOFT_SCROLLBACK all=n ia64=y
 VGACON_SOFT_SCROLLBACK_SIZE ia64=64
 MDA_CONSOLE alpha=m i386=m
-PROM_CONSOLE sparc=y sparc64=y
 DUMMY_CONSOLE all=y
 FRAMEBUFFER_CONSOLE all=y
 FRAMEBUFFER_CONSOLE_DETECT_PRIMARY all=n
@@ -4330,7 +4276,6 @@
 #- file fs/jbd/Kconfig goes here
 #- file fs/jbd2/Kconfig goes here
 FS_MBCACHE all=m
-#- file fs/reiser4/Kconfig goes here
 #- file fs/reiserfs/Kconfig goes here
 #- file fs/jfs/Kconfig goes here
 FS_POSIX_ACL all=y
@@ -4338,6 +4283,7 @@
 #- file fs/gfs2/Kconfig goes here
 #- file fs/ocfs2/Kconfig goes here
 #- file fs/btrfs/Kconfig goes here
+#- file fs/nilfs2/Kconfig goes here
 #- file fs/notify/Kconfig goes here
 #- file fs/quota/Kconfig goes here
 #- file fs/autofs/Kconfig goes here
@@ -4361,7 +4307,6 @@
 #- 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
@@ -4380,7 +4325,6 @@
 #- file fs/sysv/Kconfig goes here
 #- file fs/ufs/Kconfig goes here
 #- file fs/exofs/Kconfig goes here
-#- file fs/nilfs2/Kconfig goes here
 NETWORK_FILESYSTEMS all=y
 #- file fs/nfs/Kconfig goes here
 #- file fs/nfsd/Kconfig goes here
@@ -4534,7 +4478,6 @@
 #- *** FILE: fs/ext4/Kconfig ***
 #-
 EXT4_FS all=m
-EXT4DEV_COMPAT all=y
 EXT4_FS_XATTR all=y
 EXT4_FS_POSIX_ACL all=y
 EXT4_FS_SECURITY all=y
@@ -4897,7 +4840,6 @@
 TASK_IO_ACCOUNTING all=y
 AUDIT all=y
 AUDITSYSCALL all=y
-CLASSIC_RCU all=y
 TREE_RCU all=n
 IKCONFIG all=m
 IKCONFIG_PROC all=y
@@ -4948,16 +4890,14 @@
 TIMERFD all=y
 EVENTFD all=y
 SHMEM all=y
-PERF_COUNTERS all=y
 EVENT_PROFILE all=y
+PERF_COUNTERS all=y
 VM_EVENT_COUNTERS all=y
-STRIP_ASM_SYMS all=y
 COMPAT_BRK all=n
 SLAB all=n
 SLUB all=y
 SLOB all=n
 PROFILING all=y
-MARKERS all=n
 #- file arch/Kconfig goes here
 SLABINFO all=y
 RT_MUTEXES all=y
@@ -5073,6 +5013,7 @@
 ENABLE_MUST_CHECK all=y
 FRAME_WARN all=2048
 MAGIC_SYSRQ all=y
+STRIP_ASM_SYMS all=y
 UNUSED_SYMBOLS all=y
 #* required by oprofile
 DEBUG_FS all=y
@@ -5152,7 +5093,6 @@
 SPARSEMEM_MANUAL all=y alpha=n ppc=n sparc=n
 SPARSEMEM_VMEMMAP all=y
 MEMORY_HOTPLUG all=y
-#- Memory hotplug is currently incompatible with Software Suspend
 MEMORY_HOTREMOVE all=y
 SPLIT_PTLOCK_CPUS all=4
 MIGRATION all=y
@@ -5182,7 +5122,6 @@
 #- file net/unix/Kconfig goes here
 #- file net/xfrm/Kconfig goes here
 #- file net/iucv/Kconfig goes here
-#- file net/ring/Kconfig goes here
 INET all=y
 #- file net/ipv4/Kconfig goes here
 #- file net/ipv6/Kconfig goes here
@@ -5491,7 +5430,6 @@
 #-
 MAC80211 all=m sparc=n
 #- CFG80211 needs to be enabled for MAC80211
-MAC80211_DEFAULT_PS all=y
 MAC80211_RC_MINSTREL all=y
 MAC80211_RC_DEFAULT_MINSTREL all=y
 MAC80211_MESH all=y
@@ -5707,7 +5645,6 @@
 KEYS all=y
 KEYS_DEBUG_PROC_KEYS all=n
 SECURITY all=y
-SECURITY_DEFAULT all=""
 SECURITY_NETWORK all=y
 SECURITY_NETWORK_XFRM all=y
 SECURITY_PATH all=y
@@ -5716,7 +5653,6 @@
 #- 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
 
 #-
@@ -6038,6 +5974,7 @@
 #- file sound/soc/blackfin/Kconfig goes here
 #- file sound/soc/davinci/Kconfig goes here
 #- file sound/soc/fsl/Kconfig goes here
+#- file sound/soc/imx/Kconfig goes here
 #- file sound/soc/omap/Kconfig goes here
 #- file sound/soc/pxa/Kconfig goes here
 #- file sound/soc/s3c24xx/Kconfig goes here
@@ -6094,17 +6031,52 @@
 #-
 #- *** PROBABLY REMOVED OPTIONS ***
 #-
+AGNX all=m
+CLASSIC_RCU all=y
 COMPAT_NET_DEV_OPS all=y
 DVB_SIANO_SMS1XXX all=m
 DVB_SIANO_SMS1XXX_SMS_IDS all=y
+EPL all=m
 EVENT_TRACER all=n
+EXT4DEV_COMPAT all=y
+FB_MATROX_MULTIHEAD all=y sparc64=n
 GIGASET_UNDOCREQ ppc=n ppc64=n
+HECI all=m
+HID_DEBUG all=n
 IWLWIFI_RFKILL all=y
 LBD all=y
 LEDS_LP5521 all=m
+MAC80211_DEFAULT_PS all=y
+MARKERS all=n
+ME0600 all=m
+ME0900 all=m
+ME1000 all=m
+ME1400 all=m
+ME1600 all=m
+ME4000 all=m
+ME4600 all=m
+ME6000 all=m
+ME8100 all=m
+ME8200 all=m
+MEDUMMY all=m
+MEILHAUS all=m
+PCF8575 all=m
+PROM_CONSOLE sparc=y sparc64=y
+RADIO_TYPHOON_PROC_FS alpha=y i386=y
+RDC_17F3101X all=m
+RT3070 all=m
+SECURITY_DEFAULT all=""
+SENSORS_FSCHER all=m
+SENSORS_FSCPOS all=m
 SENSORS_MAX6875 all=m
+SENSORS_PCA9539 all=m
+SENSORS_PCF8574 all=m
+STLC45XX all=m
+SXG all=m
 THINKPAD_ACPI_BAY i386=y x86_64=y
 UNEVICTABLE_LRU all=y
+USB_ATMEL all=m
+USB_CPC all=m
 USB_SERIAL_ATEN2011 all=m
 USB_SERIAL_QUATECH_ESU100 all=m
 WDT_501_PCI all=y
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.20&r2=1.21&f=u



More information about the pld-cvs-commit mailing list