packages: kernel-vanilla/kernel-vanilla-multiarch.conf, kernel-vanilla/kern...

patrys patrys at pld-linux.org
Wed Dec 16 15:50:03 CET 2009


Author: patrys                       Date: Wed Dec 16 14:50:03 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 2.6.32.1

---- Files affected:
packages/kernel-vanilla:
   kernel-vanilla-multiarch.conf (1.133 -> 1.134) , kernel-vanilla.spec (1.224 -> 1.225) 

---- Diffs:

================================================================
Index: packages/kernel-vanilla/kernel-vanilla-multiarch.conf
diff -u packages/kernel-vanilla/kernel-vanilla-multiarch.conf:1.133 packages/kernel-vanilla/kernel-vanilla-multiarch.conf:1.134
--- packages/kernel-vanilla/kernel-vanilla-multiarch.conf:1.133	Mon Oct 26 12:20:20 2009
+++ packages/kernel-vanilla/kernel-vanilla-multiarch.conf	Wed Dec 16 15:49:57 2009
@@ -61,7 +61,10 @@
 POSIX_MQUEUE all=y
 BSD_PROCESS_ACCT all=y
 BSD_PROCESS_ACCT_V3 all=y
-TASKSTATS all=n
+TASKSTATS all=y
+TASK_DELAY_ACCT all=y
+TASK_XACCT all=y
+TASK_IO_ACCOUNTING all=y
 USER_NS all=y
 PID_NS all=y
 NET_NS all=y
@@ -220,6 +223,7 @@
 MK6 i386=n x86_64=n
 MK7 i386=n x86_64=n
 MK8 i386=n x86_64=y
+MATOM i386=n x86_64=n
 MCRUSOE i386=n x86_64=n
 MEFFICEON i386=n x86_64=n
 MWINCHIPC6 i386=n x86_64=n
@@ -362,6 +366,7 @@
 HIBERNATION_SMP_POSSIBLE all=y alpha= sparc= ppc= i386= x86_64=
 HIBERNATION all=y ppc= sparc=
 PM_STD_PARTITION all="" alpha= sparc= ppc=
+PM_RUNTIME all=y
 ACPI i386=y x86_64=y
 ACPI_SLEEP i386=y x86_64=y
 ACPI_PROCFS i386=y x86_64=y
@@ -374,6 +379,7 @@
 ACPI_FAN i386=m x86_64=m
 ACPI_BAY i386=m x86_64=m
 ACPI_PROCESSOR i386=m x86_64=m
+ACPI_PROCESSOR_AGGREGATOR i386=m x86_64=m
 ACPI_HOTPLUG_CPU x86_64=y i386=y
 ACPI_THERMAL i386=m x86_64=m
 ACPI_NUMA x86_64=y
@@ -384,6 +390,7 @@
 ACPI_DEBUG i386=n x86_64=n
 ACPI_EC i386=y x86_64=y
 ACPI_POWER i386=y x86_64=y
+ACPI_POWER_METER i386=m x86_64=m
 ACPI_SYSTEM i386=y x86_64=y
 X86_PM_TIMER i386=y x86_64=y
 ACPI_CONTAINER i386=m x86_64=m
@@ -655,6 +662,8 @@
 NETWORK_SECMARK all=y
 RDS all=m
 RDS_DEBUG all=n
+RDS_RDMA all=m
+RDS_TCP all=m
 NETFILTER all=y
 NETFILTER_DEBUG all=n
 BRIDGE_NETFILTER all=y
@@ -1048,6 +1057,8 @@
 BT_BNEP_PROTO_FILTER all=y
 BT_CMTP ppc=m x86_64=m sparc64=m i386=m alpha=m sparc=n
 BT_HIDP all=m
+BT_MRVL all=m
+BT_MRVL_SDIO all=m
 
 #
 # Bluetooth device drivers
@@ -1079,9 +1090,12 @@
 #
 WIRELESS all=y
 CFG80211 all=m
+CFG80211_DEFAULT_PS all=y
 CFG80211_REG_DEBUG all=n
 CFG80211_DEBUGFS all=n
+CFG80211_DEVELOPER_WARNINGS all=n
 NL80211 all=y
+NL80211_TESTMODE all=n
 WIRELESS_OLD_REGULATORY all=y
 WIRELESS_EXT all=y
 WIRELESS_EXT_SYSFS all=y
@@ -1129,11 +1143,17 @@
 REGULATOR_BQ24022 all=m
 REGULATOR_MAX1586 all=m
 REGULATOR_TWL4030 all=y
+REGULATOR_WM831X all=m
 REGULATOR_WM8350 all=m
 REGULATOR_WM8400 all=m
 REGULATOR_DA903X all=m
 REGULATOR_PCF50633 all=m
 REGULATOR_LP3971 all=m
+REGULATOR_PCAP all=m
+REGULATOR_MC13783 all=m
+REGULATOR_AB3100 all=m
+REGULATOR_TPS65023 all=m
+REGULATOR_TPS6507X all=m
 
 #
 # Generic Driver Options
@@ -1202,6 +1222,8 @@
 MTD_RAM all=m
 MTD_ROM ppc=m x86_64=m sparc64=m i386=m alpha=m sparc=n
 MTD_ABSENT all=m
+MTD_GPIO_ADDR all=m
+MTD_SST25L all=m
 
 #
 # Mapping drivers for chip access
@@ -1276,6 +1298,7 @@
 MTD_ONENAND_OTP ppc=y x86_64=y sparc64=y i386=y alpha=y sparc=n
 MTD_ONENAND_2X_PROGRAM all=n
 MTD_ONENAND_SIM all=n
+MTD_ONENAND_GENERIC all=m
 
 #
 # UBI - Unsorted block images
@@ -1383,6 +1406,7 @@
 THINKPAD_ACPI_DEBUG all=n ppc= sparc=
 THINKPAD_ACPI_UNSAFE_LEDS all=n
 THINKPAD_ACPI_BAY all=y ppc= sparc=
+TOPSTAR_LAPTOP all=m
 IDE i386=m x86_64=m ppc=y alpha=m sparc=n
 IDE_MAX_HWIFS alpha=4
 BLK_DEV_IDE i386=m x86_64=m ppc=y alpha=m
@@ -1521,6 +1545,7 @@
 BLK_DEV_3W_XXXX_RAID all=m sparc=
 SCSI_CXGB3_ISCSI all=m sparc=
 SCSI_BNX2_ISCSI all=m sparc=
+BE2ISCSI all=m sparc=
 SCSI_3W_9XXX all=m sparc=
 SCSI_7000FASST all=m x86_64= ppc=n sparc=
 SCSI_ACARD all=m sparc=
@@ -1610,10 +1635,13 @@
 SCSI_U14_34F_MAX_TAGS all=8 x86_64= sparc=
 SCSI_ULTRASTOR all=m x86_64= ppc= sparc=
 SCSI_NSP32 all=m x86_64= sparc=
-SCSI_DEBUG all=m
+SCSI_DEBUG all=m sparc=
+SCSI_PMCRAID all=m sparc=
 SCSI_SRP all=m sparc=
+SCSI_BFA_FC all=m sparc=
 SCSI_LOWLEVEL_PCMCIA all=n sparc=
 ATA all=m sparc=n
+ATA_VERBOSE_ERROR all=y
 ATA_NONSTANDARD all=n sparc=
 ATA_ACPI all=y ppc= sparc=
 SATA_AHCI all=m sparc=
@@ -1636,6 +1664,7 @@
 PATA_ALI all=m sparc=
 PATA_AMD all=m sparc=
 PATA_ARTOP all=m sparc=
+PATA_ATP867X all=m sparc=
 PATA_ATIIXP all=m sparc=
 PATA_CMD640_PCI all=m sparc=
 PATA_CMD64X all=m sparc=
@@ -1669,6 +1698,7 @@
 PATA_PDC_OLD all=m sparc=
 PATA_QDI all=m x86_64= sparc=
 PATA_RADISYS all=m sparc=
+PATA_RDC all=m sparc=
 PATA_RZ1000 all=m sparc=
 PATA_SC1200 all=m sparc=
 PATA_SERVERWORKS all=m sparc=
@@ -1685,9 +1715,11 @@
 MD_RAID1 all=m
 MD_RAID10 all=m
 MD_RAID456 all=m sparc=n
+MULTICORE_RAID456 all=n sparc=
 MD_RAID5_RESHAPE all=y sparc=
 MD_MULTIPATH all=m
 MD_FAULTY all=m
+ASYNC_RAID6_TEST all=m
 BLK_DEV_DM all=m
 DM_DEBUG ppc=n x86_64=n sparc64=n sparc=y i386=n alpha=n
 DM_CRYPT all=m
@@ -1890,6 +1922,7 @@
 TLAN all=m
 KS8842 all=m
 KS8851 all=m
+KS8851_MLL all=m
 VIA_RHINE all=m sparc=
 VIA_RHINE_MMIO all=y sparc=
 VIA_RHINE_NAPI all=y sparc=
@@ -1967,6 +2000,7 @@
 #
 # Wireless LAN
 #
+WLAN all=y
 WLAN_PRE80211 all=y
 STRIP all=m
 ARLAN all=m x86_64= sparc=
@@ -2007,6 +2041,10 @@
 PCMCIA_HERMES all=m sparc=
 PCMCIA_SPECTRUM all=m sparc=
 WL12XX all=m sparc=
+WL1251 all=m sparc=
+WL1251_SPI all=m sparc=
+WL1251_SDIO all=m sparc=
+WL1271 all=m sparc=
 IWM all=m sparc=
 IWM_DEBUG all=n sparc=
 ATMEL all=m sparc=
@@ -2048,6 +2086,8 @@
 B43_PCICORE_AUTOSELECT all=y sparc=
 B43_PIO all=y sparc= i386= x86_64=y ppc=
 B43_PIO_MODE all=n sparc= i386= x86_64= ppc=
+B43_SDIO all=y
+B43_PHY_LP all=y
 B43LEGACY all=m sparc=n
 B43LEGACY_DEBUG all=n sparc=
 B43LEGACY_DMA_AND_PIO_MODE all=y sparc=
@@ -2076,6 +2116,7 @@
 RT2X00_LIB_DEBUGFS all=n ppc= sparc= i386= x86_64=
 RT2X00_LIB_RFKILL all=y sparc=
 RT2X00_DEBUG all=n sparc=
+ATH_COMMON all=m
 
 #
 # USB Network Adapters
@@ -2246,6 +2287,11 @@
 MISDN_HFCPCI all=m
 MISDN_HFCMULTI all=m
 MISDN_HFCUSB all=m
+MISDN_AVMFRITZ all=m
+MISDN_SPEEDFAX all=m
+MISDN_INFINEON all=m
+MISDN_W6692 all=m
+MISDN_NETJET all=m
 
 #
 # ISDN4Linux hardware drivers
@@ -2325,6 +2371,7 @@
 # Input Device Drivers
 #
 INPUT_KEYBOARD all=y
+KEYBOARD_ADP5588 all=m
 KEYBOARD_ATKBD all=y
 KEYBOARD_SUNKBD ppc=m x86_64=m sparc64=m i386=m alpha=m sparc=y
 KEYBOARD_LKKBD all=m
@@ -2334,6 +2381,9 @@
 KEYBOARD_GPIO all=m
 KEYBOARD_MATRIX all=m
 KEYBOARD_LM8323 all=m
+KEYBOARD_MAX7359 all=m
+KEYBOARD_OPENCORES all=m
+KEYBOARD_TWL4030 all=m
 INPUT_MOUSE all=y
 MOUSE_PS2 all=m
 MOUSE_PS2_ALPS all=y
@@ -2344,6 +2394,7 @@
 MOUSE_PS2_TRACKPOINT all=y
 MOUSE_PS2_TOUCHKIT all=n
 MOUSE_PS2_OLPC all=y
+MOUSE_PS2_SENTELIC all=y
 MOUSE_SERIAL all=m
 MOUSE_APPLETOUCH all=m sparc=
 MOUSE_BCM5974 all=m sparc=
@@ -2408,6 +2459,8 @@
 TOUCHSCREEN_W90X900 all=m
 TOUCHSCREEN_TOUCHWIN all=m
 TOUCHSCREEN_UCB1400 all=m
+TOUCHSCREEN_MCS5000 all=m
+TOUCHSCREEN_PCAP all=m
 TOUCHSCREEN_USB_COMPOSITE all=m sparc=
 TOUCHSCREEN_TOUCHIT213 all=m sparc=
 TOUCHSCREEN_USB_EGALAX all=y sparc=
@@ -2421,7 +2474,9 @@
 TOUCHSCREEN_USB_IDEALTEK all=y sparc=
 TOUCHSCREEN_USB_GENERAL_TOUCH all=y sparc=
 TOUCHSCREEN_USB_GOTOP all=y sparc=
+TOUCHSCREEN_USB_E2I all=y sparc=
 TOUCHSCREEN_WACOM_W8001 all=m sparc=
+QT2160 all=m
 INPUT_MISC all=y
 INPUT_PCSPKR all=m sparc=
 INPUT_WISTRON_BTNS all=m x86_64= ppc= sparc=
@@ -2436,6 +2491,9 @@
 INPUT_UINPUT all=m
 INPUT_PCF50633_PMU all=m
 INPUT_GPIO_ROTARY_ENCODER all=m
+INPUT_WINBOND_CIR all=m
+INPUT_PCAP all=m
+INPUT_WM831X_ON all=m
 
 #
 # I2C system bus drivers (mostly embedded / system-on-chip)
@@ -2572,6 +2630,7 @@
 TELCLOCK all=m
 DEVPORT all=y sparc=
 I2C ppc=y x86_64=y sparc64=y i386=y alpha=y sparc=m
+I2C_COMPAT all=y
 I2C_BOARDINFO all=y
 I2C_CHARDEV all=m
 I2C_HELPER_AUTO=y
@@ -2639,6 +2698,7 @@
 I2C_DEBUG_ALGO all=n
 I2C_DEBUG_BUS all=n
 I2C_DEBUG_CHIP all=n
+I2C_SCMI all=m
 
 #
 # GPIO Support
@@ -2654,6 +2714,10 @@
 GPIO_MCP23S08 all=m
 GPIO_TWL4030 all=m
 GPIO_BT8XX all=m
+GPIO_LANGWELL all=y
+GPIO_MC33880 all=m
+GPIO_UCB1400 all=y
+GPIO_WM831X all=m
 
 #
 # SPI support
@@ -2700,6 +2764,7 @@
 POWER_SUPPLY all=y
 POWER_SUPPLY_DEBUG all=n
 PDA_POWER all=m
+WM831X_POWER all=m
 WM8350_POWER all=m
 BATTERY_DS2760 all=m
 BATTERY_DS2782 all=m
@@ -2768,6 +2833,7 @@
 SENSORS_SMSC47B397 all=m
 SENSORS_THMC50 all=m
 SENSORS_TMP401 all=m
+SENSORS_TMP421 all=m
 SENSORS_VIA686A all=m sparc=
 SENSORS_VT1211 all=m
 SENSORS_VT8231 all=m sparc=
@@ -2778,6 +2844,8 @@
 SENSORS_W83L785TS all=m
 SENSORS_W83627HF all=m
 SENSORS_W83627EHF all=m
+SENSORS_WM831X all=m
+SENSORS_WM8350 all=m
 SENSORS_LIS3_SPI ppc=m
 SENSORS_HDAPS all=m sparc=
 SENSORS_LIS3LV02D all=m sparc=
@@ -2790,11 +2858,13 @@
 # Watchdog Device Drivers
 #
 SOFT_WATCHDOG all=m
+WM831X_WATCHDOG all=m
 ACQUIRE_WDT all=m ppc= sparc=
 ADVANTECH_WDT all=m ppc= sparc=
 ALIM1535_WDT all=m ppc= sparc=
 ALIM7101_WDT all=m sparc=
 SC520_WDT all=m ppc= sparc=
+SBC_FITPC2_WATCHDOG all=m
 EUROTECH_WDT all=m ppc= sparc=
 IB700_WDT all=m ppc= sparc=
 IBMASR all=m ppc= sparc=
@@ -2916,6 +2986,7 @@
 VIDEO_CPIA2 all=m sparc=
 VIDEO_SAA5246A all=m
 VIDEO_SAA5249 all=m
+VIDEO_SAA7164 all=m
 TUNER_3036 all=m
 VIDEO_STRADIS all=m sparc=
 VIDEO_ZORAN_ZR36060 all=m sparc=
@@ -2979,8 +3050,12 @@
 RADIO_GEMTEK_PCI all=m sparc=
 RADIO_MAXIRADIO all=m sparc=
 RADIO_MAESTRO all=m sparc=
+I2C_SI4713 all=m
 RADIO_SF16FMI all=m x86_64= sparc=
 RADIO_SF16FMR2 all=m x86_64= sparc=
+RADIO_SI470X all=y
+I2C_SI470X all=m
+RADIO_SI4713 all=m
 RADIO_TERRATEC all=m x86_64= sparc=
 RADIO_TRUST all=m x86_64= sparc=
 RADIO_TYPHOON all=m x86_64= sparc=
@@ -2989,6 +3064,7 @@
 USB_DSBR all=m sparc=
 DVB_CORE all=m
 DVB_CAPTURE_DRIVERS all=y
+DVB_MAX_ADAPTERS all=8
 
 #
 # Supported SAA7146 based PCI Adapters
@@ -3032,6 +3108,7 @@
 DVB_USB_DTV5100 all=m sparc=
 DVB_USB_AF9015 all=m sparc=
 DVB_USB_CE6230 all=m sparc=
+DVB_USB_FRIIO all=m
 DVB_TTUSB_BUDGET all=m sparc=
 DVB_TTUSB_DEC all=m sparc=
 SMS_SIANO_MDTV all=m
@@ -3068,6 +3145,11 @@
 DVB_DM1105 all=m sparc=
 
 #
+# Supported Earthsoft PT1 Adapters
+#
+DVB_PT1 all=m
+
+#
 # Supported DVB Frontends
 #
 
@@ -3304,6 +3386,7 @@
 FB_BROADSHEET all=m
 BACKLIGHT_LCD_SUPPORT all=y
 LCD_CLASS_DEVICE all=m
+LCD_LMS283GF05 all=m
 LCD_LTV350QV all=m
 LCD_TDO24M all=m
 LCD_VGG2432A4 all=m
@@ -3316,6 +3399,7 @@
 BACKLIGHT_DA903X all=m sparc=
 BACKLIGHT_MBP_NVIDIA all=m ppc= sparc=
 BACKLIGHT_SAHARA all=m ppc= sparc=
+BACKLIGHT_WM831X all=m
 
 #
 # Generic sound devices
@@ -3346,7 +3430,7 @@
 VIDEO_SELECT all=y ppc= sparc=
 MDA_CONSOLE i386=m x86_64= ppc=n alpha=m
 DUMMY_CONSOLE all=y
-FRAMEBUFFER_CONSOLE all=m
+FRAMEBUFFER_CONSOLE all=y
 FRAMEBUFFER_CONSOLE_DETECT_PRIMARY all=y
 FRAMEBUFFER_CONSOLE_ROTATION all=y
 FONTS ppc=y x86_64=y sparc64=y i386=y alpha=y sparc=n
@@ -3475,7 +3559,7 @@
 SND_CS46XX all=m sparc=
 SND_CS46XX_NEW_DSP all=y sparc=
 SND_CS5530 all=m sparc=
-SND_CS5535AUDIO all=m x86_64= ppc= sparc=
+SND_CS5535AUDIO all=m ppc= sparc=
 SND_CTXFI all=m sparc=
 SND_DARLA20 all=m sparc=
 SND_GINA20 all=m sparc=
@@ -3516,7 +3600,9 @@
 SND_HDA_CODEC_CA0110 all=y sparc=
 SND_HDA_CODEC_CMEDIA all=y sparc=
 SND_HDA_CODEC_SI3054 all=y sparc=
+SND_HDA_CODEC_CIRRUS all=y
 SND_HDA_GENERIC all=y sparc=
+SND_HDA_PATCH_LOADER all=y
 SND_HDA_POWER_SAVE all=n sparc=
 SND_HDSP all=m sparc=
 SND_HDSPM all=m sparc=
@@ -3584,6 +3670,7 @@
 SOUND_MSNDCLAS all=n x86_64=
 SOUND_MSNDPIN all=n x86_64=
 SOUND_OSS all=m sparc=
+SOUND_OSS_CORE_PRECLAIM all=y
 SOUND_TRACEINIT all=n sparc=
 SOUND_DMAP all=n sparc=
 SOUND_SSCAPE all=m sparc=
@@ -3662,6 +3749,7 @@
 USB_EHCI_TT_NEWSCHED all=y sparc=
 USB_OXU210HP_HCD all=m sparc=
 USB_ISP116X_HCD all=m sparc=
+USB_ISP1362_HCD all=m
 USB_OHCI_HCD all=m sparc=
 USB_OHCI_HCD_SSB all=y sparc=
 USB_OHCI_BIG_ENDIAN_DESC all=n ppc=y sparc=
@@ -3851,9 +3939,11 @@
 USB_GADGET_AT91 all=n sparc=
 USB_GADGET_DUMMY_HCD all=n sparc=
 USB_GADGET_DUALSPEED all=y sparc=
+USB_GADGET_R8A66597 all=n
 USB_ZERO all=m sparc=
 USB_AUDIO all=m sparc=
 USB_ETH all=m sparc=
+USB_ETH_EEM all=n
 USB_ETH_RNDIS all=y sparc=
 USB_GADGETFS all=m sparc=
 USB_FILE_STORAGE all=m sparc=
@@ -3906,6 +3996,7 @@
 LEDS_DA903X all=m
 LEDS_DAC124S085 all=m
 LEDS_BD2802 all=m
+LEDS_WM831X_STATUS all=m
 
 #
 # LED drivers
@@ -3949,6 +4040,7 @@
 # Reporting subsystems
 #
 EDAC_DEBUG all=n sparc=
+EDAC_DECODE_MCE all=m
 EDAC_MM_EDAC all=m sparc=
 EDAC_AMD64 all=m
 EDAC_AMD64_ERROR_INJECTION all=n
@@ -3958,6 +4050,7 @@
 EDAC_I82875P all=m x86_64= ppc= sparc=
 EDAC_I82975X all=m ppc= sparc=
 EDAC_I3000 all=m x86_64=m ppc= sparc=
+EDAC_I3200 all=m
 EDAC_X38 all=m ppc= sparc=
 EDAC_I5400 all=m ppc= sparc=
 EDAC_I82860 all=m x86_64= ppc= sparc=
@@ -3995,6 +4088,10 @@
 RTC_DRV_M41T94 all=m
 RTC_DRV_TWL4030 all=m
 RTC_DRV_DS1305 all=m
+RTC_DRV_PCF2123 all=m
+RTC_DRV_WM831X all=m
+RTC_DRV_AB3100 all=m
+RTC_DRV_PCAP all=m
 
 #
 # SPI RTC drivers
@@ -4066,6 +4163,7 @@
 EXT4_FS_POSIX_ACL all=y
 EXT4_FS_SECURITY all=y
 EXT4DEV_COMPAT all=y
+EXT4_DEBUG all=n
 JBD all=m
 JBD_DEBUG all=n sparc=
 JBD2 all=m
@@ -4207,6 +4305,7 @@
 FSCACHE_STATS all=n
 FSCACHE_HISTOGRAM all=n
 FSCACHE_DEBUG all=n
+FSCACHE_OBJECT_LIST all=n
 CACHEFILES all=m
 CACHEFILES_DEBUG all=n
 CACHEFILES_HISTOGRAM all=n
@@ -4260,6 +4359,7 @@
 AFS_DEBUG all=n
 AFS_FSCACHE all=n
 9P_FS all=m
+9P_FSCACHE all=n
 
 #
 # Partition Types
@@ -4344,6 +4444,7 @@
 PROFILING all=y
 OPROFILE i386=m x86_64=m ppc=m alpha=m sparc=m
 OPROFILE_IBS all=n
+OPROFILE_EVENT_MULTIPLEX all=n
 PERF_COUNTERS all=n
 GCOV_KERNEL all=n
 KPROBES i386=n x86_64=n ppc=n
@@ -4386,6 +4487,7 @@
 DEBUG_LIST all=n
 DEBUG_SG all=n
 DEBUG_NOTIFIERS all=n
+DEBUG_CREDENTIALS all=n
 FRAME_POINTER i386=y x86_64=y
 FORCED_INLINING i386= x86_64= ppc= alpha=y sparc=y
 BOOT_PRINTK_DELAY all=n
@@ -4492,6 +4594,7 @@
 CRYPTO_CRC32C all=m
 CRYPTO_CRC32C_INTEL all=m
 CRYPTO_CAMELLIA all=m
+CRYPTO_GHASH all=m
 CRYPTO_TEST all=m
 CRYPTO_AUTHENC all=m
 CRYPTO_HW all=y
@@ -4648,7 +4751,7 @@
 ACPI_HOTPLUG_MEMORY x86_64=
 DEBUG_PAGEALLOC i386=n ppc=n x86_64=n
 DEBUG_PER_CPU_MAPS all=n
-MEMORY_HOTPLUG x86_64=
+MEMORY_HOTPLUG x86_64=n
 PPC64 ppc=n
 PPC32 ppc=y
 PPC_MERGE ppc=y
@@ -4874,6 +4977,7 @@
 B43LEGACY_RFKILL all=y
 BACKTRACE_SELF_TEST all=n
 DEBUG_BLOCK_EXT_DEVT all=n
+DEBUG_FORCE_WEAK_PER_CPU all=n
 BLK_DEV_IDECD_VERBOSE_ERRORS all=y
 BLK_DEV_IDEDMA_SFF all=y
 BLK_DEV_XIP all=n
@@ -4889,6 +4993,7 @@
 CAN_SJA1000 all=m
 CAN_SJA1000_PLATFORM all=m
 CAN_EMS_PCI all=m
+CAN_EMS_USB all=m
 CAN_KVASER_PCI all=m
 CGROUP_MEM_RES_CTLR all=n
 CGROUP_SCHED all=n
@@ -4908,6 +5013,7 @@
 CRYPTO_SALSA20_586 all=m x86_64= ppc=
 CRYPTO_SALSA20 all=m
 CRYPTO_SEQIV all=m
+CRYPTO_VMAC all=m
 DEBUG_BOOT_PARAMS all=n ppc=
 DEBUG_NX_TEST all=n ppc=
 DEFAULT_IO_DELAY_TYPE all=0 ppc=
@@ -5040,6 +5146,7 @@
 VIRTIO_NET all=m
 VIRTIO_PCI all=m
 VIRTIO_RING all=m
+VMXNET3 all=m
 X86_32_SMP all=y x86_64= ppc=
 X86_APM_BOOT all=y x86_64= ppc=
 X86_DEBUGCTLMSR all=y ppc=
@@ -5110,11 +5217,14 @@
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-vanilla/kernel-vanilla-multiarch.conf?r1=1.133&r2=1.134&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-vanilla/kernel-vanilla.spec?r1=1.224&r2=1.225&f=u



More information about the pld-cvs-commit mailing list