packages: kernel/kernel-imq.patch, kernel/kernel-multiarch.config, kernel/k...
arekm
arekm at pld-linux.org
Mon Mar 19 12:14:45 CET 2012
Author: arekm Date: Mon Mar 19 11:14:45 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- update 3.3 options/patches
---- Files affected:
packages/kernel:
kernel-imq.patch (1.15 -> 1.16) , kernel-multiarch.config (1.85 -> 1.86) , kernel-small_fixes.patch (1.55 -> 1.56) , kernel-x86.config (1.40 -> 1.41)
---- Diffs:
================================================================
Index: packages/kernel/kernel-imq.patch
diff -u packages/kernel/kernel-imq.patch:1.15 packages/kernel/kernel-imq.patch:1.16
--- packages/kernel/kernel-imq.patch:1.15 Thu Jan 5 10:54:14 2012
+++ packages/kernel/kernel-imq.patch Mon Mar 19 12:14:40 2012
@@ -1067,9 +1067,9 @@
--- linux-3.1/include/linux/skbuff.h 2011-10-24 10:10:05.000000000 +0300
+++ linux-3.1-imq/include/linux/skbuff.h 2011-11-04 11:12:52.116390515 +0200
@@ -29,6 +29,9 @@
- #include <linux/dmaengine.h>
#include <linux/hrtimer.h>
#include <linux/dma-mapping.h>
+ #include <linux/netdev_features.h>
+#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
+#include <linux/imq.h>
+#endif
@@ -1292,7 +1292,7 @@
+ printk(KERN_WARNING
+ "IMQ: kfree_skb: skb->nf_queue_entry != NULL");
+#endif
- #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE)
+ #if IS_ENABLED(CONFIG_NF_CONNTRACK)
nf_conntrack_put(skb->nfct);
#endif
@@ -533,6 +632,9 @@
@@ -1501,15 +1501,15 @@
switch (pf) {
case NFPROTO_IPV4:
-@@ -244,7 +277,7 @@
- segs->next = NULL;
- if (err == 0)
+@@ -299,7 +299,7 @@ int nf_queue(struct sk_buff *skb,
+ if (err == 0) {
+ nf_bridge_adjust_segmented_data(segs);
err = __nf_queue(segs, elem, pf, hook, indev,
- outdev, okfn, queuenum);
-+ outdev, okfn, queuenum, queuetype);
++ outdev, okfn, queuenum, queuetype);
+ }
if (err == 0)
queued++;
- else
@@ -299,9 +332,11 @@
local_bh_enable();
break;
================================================================
Index: packages/kernel/kernel-multiarch.config
diff -u packages/kernel/kernel-multiarch.config:1.85 packages/kernel/kernel-multiarch.config:1.86
--- packages/kernel/kernel-multiarch.config:1.85 Sat Mar 3 11:07:42 2012
+++ packages/kernel/kernel-multiarch.config Mon Mar 19 12:14:40 2012
@@ -6,10 +6,11 @@
CPU_SUP_AMD all=y
CPU_SUP_CENTAUR all=y
CPU_SUP_INTEL all=y
+DEBUG_NMI_SELFTEST all=n
DEBUG_SET_MODULE_RONX all=y
DEBUG_STRICT_USER_COPY_CHECKS all=n
DMI all=y
-EARLY_PRINTK_MRST all=n
+EFI_STUB all=y
GART_IOMMU all=y
KEYS_COMPAT all=y
KVM_MMU_AUDIT all=y
@@ -28,6 +29,7 @@
BLK_DEV_BSGLIB all=y
BLK_DEV_INTEGRITY all=y
BLK_DEV_THROTTLING all=y
+#- file block/partitions/Kconfig goes here
#- file block/Kconfig.iosched goes here
#-
@@ -43,6 +45,35 @@
DEFAULT_IOSCHED all="cfq"
#-
+#- *** FILE: block/partitions/Kconfig ***
+#-
+PARTITION_ADVANCED all=y
+ACORN_PARTITION all=y
+ACORN_PARTITION_CUMANA all=y
+ACORN_PARTITION_EESOX all=y
+ACORN_PARTITION_ICS all=y
+ACORN_PARTITION_ADFS all=y
+ACORN_PARTITION_POWERTEC all=y
+ACORN_PARTITION_RISCIX all=y
+OSF_PARTITION all=y
+AMIGA_PARTITION all=y
+ATARI_PARTITION all=y
+MAC_PARTITION all=y
+MSDOS_PARTITION all=y
+BSD_DISKLABEL all=y
+MINIX_SUBPARTITION all=y
+SOLARIS_X86_PARTITION all=y
+UNIXWARE_DISKLABEL all=y
+LDM_PARTITION all=y
+LDM_DEBUG all=n
+SGI_PARTITION all=y
+ULTRIX_PARTITION all=y
+SUN_PARTITION all=y
+KARMA_PARTITION all=y
+EFI_PARTITION all=y
+SYSV68_PARTITION all=y
+
+#-
#- *** FILE: crypto/Kconfig ***
#-
#- file crypto/async_tx/Kconfig goes here
@@ -116,6 +147,7 @@
CRYPTO_SALSA20_X86_64 x86_64=m
CRYPTO_SEED all=m
CRYPTO_SERPENT all=m
+CRYPTO_SERPENT_SSE2_X86_64 all=m
CRYPTO_TEA all=m
CRYPTO_TWOFISH all=m
CRYPTO_TWOFISH_COMMON all=m
@@ -350,6 +382,7 @@
BLK_DEV_XD alpha=m i386=m
PARIDE all=m
#- file drivers/block/paride/Kconfig goes here
+#- file drivers/block/mtip32xx/Kconfig goes here
BLK_CPQ_DA all=m sparc64=n
BLK_CPQ_CISS_DA all=m sparc=n
CISS_SCSI_TAPE all=y
@@ -361,6 +394,7 @@
BLK_DEV_CRYPTOLOOP all=n
#- file drivers/block/drbd/Kconfig goes here
BLK_DEV_NBD all=m
+BLK_DEV_NVME all=m
BLK_DEV_OSD all=m
BLK_DEV_SX8 all=m
BLK_DEV_UB all=n
@@ -388,6 +422,11 @@
DRBD_FAULT_INJECTION all=n
#-
+#- *** FILE: drivers/block/mtip32xx/Kconfig ***
+#-
+BLK_DEV_PCIESSD_MTIP32XX all=m
+
+#-
#- *** FILE: drivers/block/paride/Kconfig ***
#-
#- Parallel IDE high-level drivers
@@ -682,7 +721,6 @@
DMI_SYSFS all=m
ISCSI_IBFT_FIND all=y
ISCSI_IBFT all=m
-SIGMA all=m
#- file drivers/firmware/google/Kconfig goes here
#-
@@ -710,6 +748,7 @@
GPIO_PCA953X all=m
GPIO_PCF857X all=m
GPIO_SX150X all=m
+GPIO_STMPE all=y
GPIO_TPS65912 all=m
GPIO_TWL4030 powerpc=m
GPIO_WM831X all=m
@@ -750,6 +789,14 @@
DRM_SAVAGE all=m
#- file drivers/gpu/drm/exynos/Kconfig goes here
#- file drivers/gpu/drm/vmwgfx/Kconfig goes here
+#- file drivers/gpu/drm/gma500/Kconfig goes here
+
+#-
+#- *** FILE: drivers/gpu/drm/gma500/Kconfig ***
+#-
+DRM_GMA500 all=m
+DRM_GMA600 all=y
+DRM_GMA3600 all=y
#-
#- *** FILE: drivers/gpu/drm/nouveau/Kconfig ***
@@ -834,10 +881,10 @@
HID_PICOLCD_LCD all=y
HID_PICOLCD_LEDS all=y
HID_PRIMAX all=m
-HID_QUANTA all=m
HID_ROCCAT all=m
HID_ROCCAT_COMMON all=m
HID_ROCCAT_ARVO all=m
+HID_ROCCAT_ISKU all=m
HID_ROCCAT_KONE all=m
HID_ROCCAT_KONEPLUS all=m
HID_ROCCAT_KOVAPLUS all=m
@@ -848,6 +895,7 @@
HID_SUNPLUS all=m
HID_GREENASIA all=m
GREENASIA_FF all=y
+HID_HYPERV_MOUSE all=m
HID_SMARTJOYPLUS all=m
SMARTJOYPLUS_FF all=y
HID_TOPSEED all=m
@@ -856,6 +904,7 @@
HID_WACOM all=m
HID_WACOM_POWER_SUPPLY all=y
HID_WIIMOTE all=m
+HID_WIIMOTE_EXT all=y
HID_ZEROPLUS all=m
ZEROPLUS_FF all=y
HID_ZYDACRON all=m
@@ -1201,6 +1250,7 @@
#- file drivers/infiniband/hw/nes/Kconfig goes here
#- file drivers/infiniband/ulp/ipoib/Kconfig goes here
#- file drivers/infiniband/ulp/srp/Kconfig goes here
+#- file drivers/infiniband/ulp/srpt/Kconfig goes here
#- file drivers/infiniband/ulp/iser/Kconfig goes here
#-
@@ -1265,6 +1315,11 @@
INFINIBAND_SRP all=m sparc=
#-
+#- *** FILE: drivers/infiniband/ulp/srpt/Kconfig ***
+#-
+INFINIBAND_SRPT all=m
+
+#-
#- *** FILE: drivers/input/Kconfig ***
#-
INPUT all=y
@@ -1351,6 +1406,7 @@
KEYBOARD_GPIO all=m
KEYBOARD_GPIO_POLLED all=m
KEYBOARD_TCA6416 all=m
+KEYBOARD_TCA8418 all=m
KEYBOARD_MATRIX all=m
KEYBOARD_LM8323 all=m
KEYBOARD_MAX7359 all=m
@@ -1360,6 +1416,7 @@
KEYBOARD_OPENCORES all=m
KEYBOARD_STOWAWAY all=m
KEYBOARD_SUNKBD all=m sparc=y sparc64=y
+KEYBOARD_STMPE all=m
KEYBOARD_TWL4030 powerpc=m
KEYBOARD_XTKBD all=m
@@ -1378,6 +1435,8 @@
INPUT_MMA8450 all=m
INPUT_MPU3050 all=m
INPUT_APANEL all=m
+INPUT_GP2A all=m
+INPUT_GPIO_TILT_POLLED all=m
INPUT_WISTRON_BTNS i386=m
INPUT_ATLAS_BTNS i386=m x86_64=m
INPUT_ATI_REMOTE2 all=m sparc=n
@@ -1461,12 +1520,14 @@
TOUCHSCREEN_AD7879_I2C all=m
TOUCHSCREEN_AD7879_SPI all=m
TOUCHSCREEN_ATMEL_MXT all=m
+TOUCHSCREEN_AUO_PIXCIR all=m
TOUCHSCREEN_BU21013 all=m
TOUCHSCREEN_CY8CTMG110 all=m
TOUCHSCREEN_DA9034 all=m
TOUCHSCREEN_DYNAPRO all=m
TOUCHSCREEN_HAMPSHIRE all=m
TOUCHSCREEN_EETI all=m
+TOUCHSCREEN_EGALAX all=m
TOUCHSCREEN_FUJITSU all=m
TOUCHSCREEN_GUNZE all=m
TOUCHSCREEN_ELO all=m
@@ -1482,6 +1543,7 @@
TOUCHSCREEN_TOUCHRIGHT all=m
TOUCHSCREEN_TOUCHWIN all=m
TOUCHSCREEN_UCB1400 all=m sparc=n
+TOUCHSCREEN_PIXCIR all=m
TOUCHSCREEN_WM831X all=m
TOUCHSCREEN_WM97XX all=m
TOUCHSCREEN_WM9705 all=y
@@ -1512,12 +1574,14 @@
TOUCHSCREEN_W90X900 all=m
TOUCHSCREEN_PCAP all=m
TOUCHSCREEN_ST1232 all=m
+TOUCHSCREEN_STMPE all=m
TOUCHSCREEN_TPS6507X all=m
#-
#- *** FILE: drivers/iommu/Kconfig ***
#-
IOMMU_SUPPORT all=y
+AMD_IOMMU_V2 all=m
INTEL_IOMMU all=y
INTEL_IOMMU_DEFAULT_ON all=y
IRQ_REMAP all=y
@@ -1684,6 +1748,8 @@
LEDS_LT3593 all=m
LEDS_DELL_NETBOOKS all=m
LEDS_MC13783 all=m
+LEDS_TCA6507 all=m
+LEDS_OT200 all=m
LEDS_TRIGGERS all=y
#- LED Triggers
LEDS_TRIGGER_TIMER all=m
@@ -2013,12 +2079,24 @@
#- *** FILE: drivers/media/radio/Kconfig ***
#-
RADIO_ADAPTERS all=y
+RADIO_SI470X all=y
+#- file drivers/media/radio/si470x/Kconfig goes here
+USB_MR800 all=m
+USB_DSBR all=m
+RADIO_MAXIRADIO all=m
+I2C_SI4713 all=m
+RADIO_SI4713 all=m
+RADIO_TEA5764 all=m
+RADIO_SAA7706H all=m
+RADIO_TEF6862 all=m
+RADIO_TIMBERDALE all=m
+RADIO_WL1273 all=m
+#- file drivers/media/radio/wl128x/Kconfig goes here
RADIO_CADET alpha=m i386=m
RADIO_RTRACK alpha=m i386=m
RADIO_RTRACK2 alpha=m i386=m
RADIO_AZTECH alpha=m i386=m
RADIO_GEMTEK alpha=m i386=m
-RADIO_MAXIRADIO all=m
RADIO_MIROPCM20 all=m
RADIO_SF16FMI alpha=m i386=m
RADIO_SF16FMR2 alpha=m i386=m
@@ -2026,18 +2104,6 @@
RADIO_TRUST alpha=m i386=m
RADIO_TYPHOON alpha=m i386=m
RADIO_ZOLTRIX alpha=m i386=m
-I2C_SI4713 all=m
-RADIO_SI4713 all=m
-USB_DSBR all=m
-RADIO_SI470X all=y
-#- file drivers/media/radio/si470x/Kconfig goes here
-USB_MR800 all=m
-RADIO_TEA5764 all=m
-RADIO_SAA7706H all=m
-RADIO_TEF6862 all=m
-RADIO_TIMBERDALE all=m
-RADIO_WL1273 all=m
-#- file drivers/media/radio/wl128x/Kconfig goes here
#-
#- *** FILE: drivers/media/radio/si470x/Kconfig ***
@@ -2061,6 +2127,7 @@
IR_JVC_DECODER all=m
IR_SONY_DECODER all=m
IR_RC5_SZ_DECODER all=m
+IR_SANYO_DECODER all=m
IR_MCE_KBD_DECODER all=m
IR_LIRC_CODEC all=m
RC_ATI_REMOTE all=m
@@ -2135,30 +2202,49 @@
VIDEO_UPD64083 all=m
#- Miscelaneous helper chips
VIDEO_VIVI all=m
-#- file drivers/media/video/davinci/Kconfig goes here
-#- file drivers/media/video/omap/Kconfig goes here
-#- file drivers/media/video/bt8xx/Kconfig goes here
-VIDEO_PMS all=m
-VIDEO_BWQCAM all=m
-VIDEO_CQCAM all=m
-VIDEO_W9966 all=m
+V4L_USB_DRIVERS all=y sparc=n
+#- 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/tlg2300/Kconfig goes here
+#- file drivers/media/video/cx231xx/Kconfig goes here
+#- file drivers/media/video/tm6000/Kconfig goes here
+#- file drivers/media/video/usbvision/Kconfig goes here
+#- file drivers/media/video/et61x251/Kconfig goes here
+#- file drivers/media/video/sn9c102/Kconfig goes here
+#- file drivers/media/video/pwc/Kconfig goes here
#- file drivers/media/video/cpia2/Kconfig goes here
-#- file drivers/media/video/zoran/Kconfig goes here
-VIDEO_MEYE i386=m x86_64=m
-#- file drivers/media/video/saa7134/Kconfig goes here
-VIDEO_MXB all=m sparc=n
-VIDEO_HEXIUM_ORION all=m
-VIDEO_HEXIUM_GEMINI all=m
-VIDEO_TIMBERDALE all=m
-#- file drivers/media/video/cx88/Kconfig goes here
+USB_ZR364XX all=m
+USB_STKWEBCAM all=m
+USB_S2255 all=m
+V4L_PCI_DRIVERS all=y
+#- file drivers/media/video/au0828/Kconfig goes here
+#- file drivers/media/video/bt8xx/Kconfig goes here
+#- file drivers/media/video/cx18/Kconfig goes here
#- file drivers/media/video/cx23885/Kconfig goes here
#- file drivers/media/video/cx25821/Kconfig goes here
-#- file drivers/media/video/au0828/Kconfig goes here
+#- file drivers/media/video/cx88/Kconfig goes here
+VIDEO_HEXIUM_GEMINI all=m
+VIDEO_HEXIUM_ORION all=m
#- file drivers/media/video/ivtv/Kconfig goes here
-#- file drivers/media/video/cx18/Kconfig goes here
+VIDEO_MEYE i386=m x86_64=m
+VIDEO_MXB all=m sparc=n
+#- file drivers/media/video/saa7134/Kconfig goes here
#- file drivers/media/video/saa7164/Kconfig goes here
+#- file drivers/media/video/zoran/Kconfig goes here
+V4L_ISA_PARPORT_DRIVERS all=y
+VIDEO_BWQCAM all=m
+VIDEO_CQCAM all=m
+VIDEO_PMS all=m
+VIDEO_W9966 all=m
+V4L_PLATFORM_DRIVERS all=y
#- file drivers/media/video/marvell-ccic/Kconfig goes here
VIDEO_VIA_CAMERA all=m
+#- file drivers/media/video/davinci/Kconfig goes here
+#- file drivers/media/video/omap/Kconfig goes here
+VIDEO_TIMBERDALE all=m
SOC_CAMERA all=m
SOC_CAMERA_IMX074 all=m
SOC_CAMERA_MT9M001 all=m
@@ -2177,22 +2263,6 @@
SOC_CAMERA_OV9740 all=m
VIDEO_SH_MOBILE_CEU all=m
#- file drivers/media/video/s5p-tv/Kconfig goes here
-V4L_USB_DRIVERS all=y sparc=n
-#- 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/tlg2300/Kconfig goes here
-#- file drivers/media/video/cx231xx/Kconfig goes here
-#- file drivers/media/video/tm6000/Kconfig goes here
-#- file drivers/media/video/usbvision/Kconfig goes here
-#- file drivers/media/video/et61x251/Kconfig goes here
-#- file drivers/media/video/sn9c102/Kconfig goes here
-#- file drivers/media/video/pwc/Kconfig goes here
-USB_ZR364XX all=m
-USB_STKWEBCAM all=m
-USB_S2255 all=m
V4L_MEM2MEM_DRIVERS all=y
VIDEO_MEM2MEM_TESTDEV all=m
@@ -2278,6 +2348,7 @@
USB_GSPCA_ETOMS all=m
USB_GSPCA_FINEPIX all=m
USB_GSPCA_JEILINJ all=m
+USB_GSPCA_JL2005BCD all=m
USB_GSPCA_KINECT all=m
USB_GSPCA_KONICA all=m
USB_GSPCA_MARS all=m
@@ -2481,7 +2552,10 @@
MFD_TPS6586X all=m
MFD_TPS65912_SPI all=y
TWL4030_CORE powerpc=y
+MFD_STMPE all=y
+STMPE_SPI all=y
PMIC_DA903X powerpc=y
+MFD_DA9052_SPI all=y
MFD_WM8400 all=m
MFD_WM831X all=y
MFD_WM831X_SPI all=y
@@ -2511,7 +2585,6 @@
#- *** FILE: drivers/misc/Kconfig ***
#-
SENSORS_LIS3LV02D all=m
-MISC_DEVICES all=y
AD525X_DPOT all=m
AD525X_DPOT_I2C all=m
AD525X_DPOT_SPI all=m
@@ -2824,6 +2897,7 @@
MII all=m
#- file drivers/ieee802154/Kconfig goes here
IFB all=m
+#- file drivers/net/team/Kconfig goes here
MACVLAN all=m
MACVTAP all=m
NETCONSOLE all=m
@@ -2838,6 +2912,7 @@
#- file drivers/net/arcnet/Kconfig goes here
#- file drivers/atm/Kconfig goes here
#- file drivers/net/caif/Kconfig goes here
+#- file drivers/net/dsa/Kconfig goes here
#- file drivers/net/ethernet/Kconfig goes here
#- file drivers/net/fddi/Kconfig goes here
#- file drivers/net/hippi/Kconfig goes here
@@ -2855,6 +2930,7 @@
XEN_NETDEV_FRONTEND all=m
XEN_NETDEV_BACKEND all=m
VMXNET3 all=m
+#- file drivers/net/hyperv/Kconfig goes here
#-
#- *** FILE: drivers/net/appletalk/Kconfig ***
@@ -2907,6 +2983,7 @@
#- file drivers/net/can/mscan/Kconfig goes here
#- file drivers/net/can/sja1000/Kconfig goes here
#- file drivers/net/can/c_can/Kconfig goes here
+#- file drivers/net/can/cc770/Kconfig goes here
#- file drivers/net/can/usb/Kconfig goes here
#- file drivers/net/can/softing/Kconfig goes here
CAN_DEBUG_DEVICES all=n
@@ -2918,6 +2995,13 @@
CAN_C_CAN_PLATFORM all=m
#-
+#- *** FILE: drivers/net/can/cc770/Kconfig ***
+#-
+CAN_CC770 all=m
+CAN_CC770_ISA all=m
+CAN_CC770_PLATFORM all=m
+
+#-
#- *** FILE: drivers/net/can/sja1000/Kconfig ***
#-
CAN_SJA1000 all=m
@@ -2944,6 +3028,13 @@
CAN_ESD_USB2 all=m
#-
+#- *** FILE: drivers/net/dsa/Kconfig ***
+#-
+NET_DSA_MV88E6060 all=y
+NET_DSA_MV88E6131 all=y
+NET_DSA_MV88E6123_61_65 all=y
+
+#-
#- *** FILE: drivers/net/ethernet/3com/Kconfig ***
#-
NET_VENDOR_3COM all=y
@@ -2991,6 +3082,7 @@
#- file drivers/net/ethernet/adi/Kconfig goes here
#- file drivers/net/ethernet/broadcom/Kconfig goes here
#- file drivers/net/ethernet/brocade/Kconfig goes here
+#- file drivers/net/ethernet/calxeda/Kconfig goes here
#- file drivers/net/ethernet/chelsio/Kconfig goes here
#- file drivers/net/ethernet/cirrus/Kconfig goes here
#- file drivers/net/ethernet/cisco/Kconfig goes here
@@ -3109,6 +3201,11 @@
BNA all=m
#-
+#- *** FILE: drivers/net/ethernet/calxeda/Kconfig ***
+#-
+NET_CALXEDA_XGMAC all=m
+
+#-
#- *** FILE: drivers/net/ethernet/chelsio/Kconfig ***
#-
CHELSIO_T1 all=m sparc=n
@@ -3406,6 +3503,8 @@
#- *** FILE: drivers/net/ethernet/stmicro/stmmac/Kconfig ***
#-
STMMAC_ETH all=m
+STMMAC_PLATFORM all=m
+STMMAC_PCI all=m
STMMAC_DEBUG_FS all=y
STMMAC_DA all=y
STMMAC_RING all=y
@@ -3493,6 +3592,11 @@
ROADRUNNER_LARGE_RINGS all=n
#-
+#- *** FILE: drivers/net/hyperv/Kconfig ***
+#-
+HYPERV_NET all=m
+
+#-
#- *** FILE: drivers/net/irda/Kconfig ***
#-
#- SIR device drivers
@@ -3547,6 +3651,7 @@
FIXED_PHY all=y
MDIO_BITBANG all=m
MDIO_GPIO all=m
+MICREL_KS8995MA all=m
#-
#- *** FILE: drivers/net/plip/Kconfig ***
@@ -3579,6 +3684,13 @@
SLIP_MODE_SLIP6 all=y
#-
+#- *** FILE: drivers/net/team/Kconfig ***
+#-
+NET_TEAM all=m
+NET_TEAM_MODE_ROUNDROBIN all=m
+NET_TEAM_MODE_ACTIVEBACKUP all=m
+
+#-
#- *** FILE: drivers/net/tokenring/Kconfig ***
#-
TR all=y sparc=n
@@ -3755,6 +3867,7 @@
ATH9K_AHB all=y
ATH9K_DEBUGFS all=n
ATH9K_RATE_CONTROL all=y
+ATH9K_BTCOEX_SUPPORT all=y
ATH9K_HTC all=m
ATH9K_HTC_DEBUGFS all=y
@@ -3821,9 +3934,7 @@
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-imq.patch?r1=1.15&r2=1.16&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-multiarch.config?r1=1.85&r2=1.86&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-small_fixes.patch?r1=1.55&r2=1.56&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-x86.config?r1=1.40&r2=1.41&f=u
More information about the pld-cvs-commit
mailing list