diff options
| author | Adam Williamson <awilliam@redhat.com> | 2014-11-22 08:26:24 -0800 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2014-11-22 08:26:24 -0800 |
| commit | 87f9785b4325717c20e15d9847dddcbea472a2d4 (patch) | |
| tree | 68bf50e5f9125a3da17e610f03a5496c2fc1a299 /config-generic | |
| parent | cd2051e50eb862afffdce13da1b05ef6d7c774e1 (diff) | |
| parent | 33fc8e2a5b2a9cde80a0e305ac09085585292e96 (diff) | |
| download | kernel-87f9785b4325717c20e15d9847dddcbea472a2d4.tar.gz kernel-87f9785b4325717c20e15d9847dddcbea472a2d4.tar.xz kernel-87f9785b4325717c20e15d9847dddcbea472a2d4.zip | |
Merge branch 'master' into baytrail
Diffstat (limited to 'config-generic')
| -rw-r--r-- | config-generic | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/config-generic b/config-generic index 0a4865c01..498d28b0c 100644 --- a/config-generic +++ b/config-generic @@ -706,8 +706,6 @@ CONFIG_FIREWIRE_NOSY=m # CONFIG_NET=y -CONFIG_NET_DMA=y - CONFIG_NETLINK_MMAP=y CONFIG_NETLINK_DIAG=m @@ -1417,7 +1415,7 @@ CONFIG_IXGBE_HWMON=y CONFIG_I40E=m # CONFIG_I40E_VXLAN is not set # CONFIG_I40E_DCB is not set -# CONFIG_I40EVF is not set +CONFIG_I40EVF=m CONFIG_FM10K=m # CONFIG_FM10K_VXLAN is not set @@ -2762,13 +2760,8 @@ CONFIG_KXCJK1013=m # CONFIG_AD7816 is not set # CONFIG_AD7192 is not set # CONFIG_AD7280 is not set -# CONFIG_AD5930 is not set # CONFIG_AD9832 is not set # CONFIG_AD9834 is not set -# CONFIG_AD9850 is not set -# CONFIG_AD9852 is not set -# CONFIG_AD9910 is not set -# CONFIG_AD9951 is not set # CONFIG_ADIS16060 is not set # CONFIG_ADE7753 is not set # CONFIG_ADE7754 is not set @@ -3544,7 +3537,7 @@ CONFIG_SND_FIREWIRE_SPEAKERS=m CONFIG_SND_ISIGHT=m CONFIG_SND_SCS1X=m CONFIG_SND_DICE=m -# CONFIG_SND_FIREWORKS is not set +CONFIG_SND_FIREWORKS=m # CONFIG_SND_BEBOB is not set # @@ -3884,7 +3877,6 @@ CONFIG_USB_SERIAL_MCT_U232=m CONFIG_USB_SERIAL_MOS7720=m CONFIG_USB_SERIAL_MOS7715_PARPORT=y # CONFIG_USB_SERIAL_WISHBONE is not set -# CONFIG_USB_SERIAL_ZTE is not set CONFIG_USB_SERIAL_MOS7840=m # CONFIG_USB_SERIAL_MXUPORT is not set CONFIG_USB_SERIAL_NAVMAN=m @@ -5033,9 +5025,6 @@ CONFIG_RTL8192E=m # CONFIG_INPUT_GPIO is not set # CONFIG_VIDEO_CX25821 is not set # CONFIG_R8188EU is not set -# Larry Finger maintains (rhbz 1113422) -CONFIG_R8192EE=m -# CONFIG_R8821AE is not set # CONFIG_RTL8192U is not set CONFIG_R8723AU=m # Jes Sorensen maintains this (rhbz 1100162) # CONFIG_8723AU_AP_MODE is not set @@ -5064,7 +5053,6 @@ CONFIG_ALTERA_STAPL=m # CONFIG_DGNC is not set # CONFIG_RTS5208 is not set # CONFIG_GS_FPGABOOT is not set -# CONFIG_BT_NOKIA_H4P is not set # CONFIG_UNISYSSPAR is not set # CONFIG_MEDIA_TUNER_MSI001 is not set # END OF STAGING @@ -5281,3 +5269,6 @@ CONFIG_FMC_CHARDEV=m # CONFIG_SBSAUART_TTY is not set # CONFIG_SERIAL_8250_FINTEK is not set + +# set in x86-generic presently +# CONFIG_TOUCHSCREEN_GOODIX is not set |