Home| summaryrefslogtreecommitdiff |
| author | Michal Marek <mmarek@suse.cz> | 2013-05-21 09:22:28 (GMT) |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2013-05-21 09:22:28 (GMT) |
| commit | b757a659016d18684bf053cc40863672c26cea68 (patch) (side-by-side diff) | |
| tree | 7189719020e358f0b3507642f535396fae772794 | |
| parent | f45fe721b9047f817b8c89ddc9b68ff06449bf32 (diff) | |
Automatically updated to 3.10-rc2-next-20130521linux-next
| -rw-r--r-- | config/i386/vanilla | 14 | ||||
| -rw-r--r-- | config/x86_64/vanilla | 14 | ||||
| -rw-r--r-- | rpm/config.sh | 2 |
3 files changed, 19 insertions, 11 deletions
diff --git a/config/i386/vanilla b/config/i386/vanilla index b7030dd..9c2c332 100644 --- a/config/i386/vanilla +++ b/config/i386/vanilla @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.10.0-rc1 Kernel Configuration +# Linux/i386 3.10.0-rc2 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -663,6 +663,10 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PASID=y CONFIG_PCI_IOAPIC=y CONFIG_PCI_LABEL=y + +# +# PCI host controller drivers +# CONFIG_ISA_DMA_API=y CONFIG_ISA=y # CONFIG_EISA is not set @@ -1248,6 +1252,7 @@ CONFIG_RFS_ACCEL=y CONFIG_XPS=y CONFIG_NETPRIO_CGROUP=m CONFIG_BQL=y +CONFIG_NET_FLOW_LIMIT=y # # Network testing @@ -3755,7 +3760,6 @@ CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEO_V4L2_INT_DEVICE=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y @@ -4924,6 +4928,7 @@ CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_FUSBH200_HCD=m CONFIG_USB_OHCI_HCD=m # CONFIG_USB_OHCI_HCD_SSB is not set CONFIG_USB_OHCI_HCD_PLATFORM=y @@ -4980,7 +4985,6 @@ CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m # CONFIG_USB_DWC3 is not set CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_CHIPIDEA_DEBUG=y # @@ -5479,9 +5483,9 @@ CONFIG_IIO_DUMMY_EVGEN=m CONFIG_IIO_SIMPLE_DUMMY=m CONFIG_IIO_SIMPLE_DUMMY_EVENTS=y CONFIG_IIO_SIMPLE_DUMMY_BUFFER=y +CONFIG_ZSMALLOC=y CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set -CONFIG_ZSMALLOC=y CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m CONFIG_FB_SM7XX=m @@ -5528,7 +5532,6 @@ CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -CONFIG_SOLO6X10=m CONFIG_LIRC_STAGING=y CONFIG_LIRC_BT829=m CONFIG_LIRC_IGORPLUGUSB=m @@ -5566,6 +5569,7 @@ CONFIG_USB_DWC2_DEBUG=y CONFIG_USB_DWC2_VERBOSE=y CONFIG_USB_DWC2_TRACK_MISSED_SOFS=y CONFIG_USB_DWC2_DEBUG_PERIODIC=y +CONFIG_USB_BTMTK=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla index 4d5c715..1e9e269 100644 --- a/config/x86_64/vanilla +++ b/config/x86_64/vanilla @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.10.0-rc1 Kernel Configuration +# Linux/x86_64 3.10.0-rc2 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -640,6 +640,10 @@ CONFIG_PCI_PRI=y CONFIG_PCI_PASID=y CONFIG_PCI_IOAPIC=y CONFIG_PCI_LABEL=y + +# +# PCI host controller drivers +# CONFIG_ISA_DMA_API=y CONFIG_AMD_NB=y CONFIG_PCCARD=m @@ -1214,6 +1218,7 @@ CONFIG_XPS=y CONFIG_NETPRIO_CGROUP=m CONFIG_BQL=y CONFIG_BPF_JIT=y +CONFIG_NET_FLOW_LIMIT=y # # Network testing @@ -3632,7 +3637,6 @@ CONFIG_VIDEOBUF2_CORE=m CONFIG_VIDEOBUF2_MEMOPS=m CONFIG_VIDEOBUF2_DMA_CONTIG=m CONFIG_VIDEOBUF2_VMALLOC=m -CONFIG_VIDEOBUF2_DMA_SG=m CONFIG_VIDEO_V4L2_INT_DEVICE=m CONFIG_DVB_CORE=m CONFIG_DVB_NET=y @@ -4731,6 +4735,7 @@ CONFIG_USB_OXU210HP_HCD=m CONFIG_USB_ISP116X_HCD=m CONFIG_USB_ISP1760_HCD=m CONFIG_USB_ISP1362_HCD=m +CONFIG_USB_FUSBH200_HCD=m CONFIG_USB_OHCI_HCD=m CONFIG_USB_OHCI_HCD_SSB=y CONFIG_USB_OHCI_HCD_PLATFORM=y @@ -4787,7 +4792,6 @@ CONFIG_USB_MDC800=m CONFIG_USB_MICROTEK=m # CONFIG_USB_DWC3 is not set CONFIG_USB_CHIPIDEA=m -CONFIG_USB_CHIPIDEA_HOST=y CONFIG_USB_CHIPIDEA_DEBUG=y # @@ -5204,9 +5208,9 @@ CONFIG_USB_SERIAL_QUATECH2=m CONFIG_VT6655=m CONFIG_VT6656=m CONFIG_DX_SEP=m +CONFIG_ZSMALLOC=y CONFIG_ZRAM=m # CONFIG_ZRAM_DEBUG is not set -CONFIG_ZSMALLOC=y CONFIG_WLAGS49_H2=m CONFIG_WLAGS49_H25=m CONFIG_FB_SM7XX=m @@ -5253,7 +5257,6 @@ CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_LOADER=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m -CONFIG_SOLO6X10=m CONFIG_LIRC_STAGING=y CONFIG_LIRC_BT829=m CONFIG_LIRC_IGORPLUGUSB=m @@ -5291,6 +5294,7 @@ CONFIG_USB_DWC2_DEBUG=y CONFIG_USB_DWC2_VERBOSE=y CONFIG_USB_DWC2_TRACK_MISSED_SOFS=y CONFIG_USB_DWC2_DEBUG_PERIODIC=y +CONFIG_USB_BTMTK=m CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ACERHDF=m diff --git a/rpm/config.sh b/rpm/config.sh index 32df662..b35b683 100644 --- a/rpm/config.sh +++ b/rpm/config.sh @@ -1,5 +1,5 @@ # The version of the main tarball to use -SRCVERSION=3.10-rc1-next-20130517 +SRCVERSION=3.10-rc2-next-20130521 # variant of the kernel-source package, either empty or "-rt" VARIANT= # Set to 1 if the tree does not contain any non-vanilla patches at all |