Merge branch 'master' of ssh://g.hz.netease.com:22222/IoT/PV2/SmartAudioPV2
This commit is contained in:
commit
68f4714f1b
|
@ -311,7 +311,6 @@ CONFIG_FB_CMDLINE=y
|
|||
# CONFIG_FB_CONSOLE_SUNXI is not set
|
||||
CONFIG_FB_NOTIFY=y
|
||||
CONFIG_FHANDLE=y
|
||||
# CONFIG_FILE_LOCKING is not set
|
||||
# CONFIG_FIQ_DEBUGGER is not set
|
||||
# CONFIG_FIQ_WATCHDOG is not set
|
||||
CONFIG_FIRMWARE_IN_KERNEL=y
|
||||
|
@ -543,6 +542,7 @@ CONFIG_MAC80211_RC_MINSTREL_HT=y
|
|||
# CONFIG_MAC80211_RC_MINSTREL_VHT is not set
|
||||
# CONFIG_MACSEC is not set
|
||||
CONFIG_MAGIC_SYSRQ=y
|
||||
CONFIG_MANDATORY_FILE_LOCKING=y
|
||||
CONFIG_MAY_USE_DEVLINK=y
|
||||
CONFIG_MEDIA_CAMERA_SUPPORT=y
|
||||
CONFIG_MEDIA_CONTROLLER=y
|
||||
|
|
Loading…
Reference in New Issue