Merge branch 'master' of ssh://g.hz.netease.com:22222/IoT/PV2/SmartAudioPV2

This commit is contained in:
HuangXin 2018-08-29 16:12:29 +08:00
commit 27837845c7
2 changed files with 3 additions and 2 deletions

View File

@ -836,7 +836,8 @@ dtb-$(CONFIG_ARCH_SUN8IW6P1) += \
sun8iw6p1-soc.dtb sun8iw6p1-soc.dtb
dtb-$(CONFIG_ARCH_SUN8IW15P1) += \ dtb-$(CONFIG_ARCH_SUN8IW15P1) += \
sun8iw15p1-soc.dtb \ sun8iw15p1-soc.dtb \
sun8iw15p1-mandolin-perf1.dtb sun8iw15p1-mandolin-perf1.dtb\
sun8iw15p1-mandolin-pv1.dtb
dtb-$(CONFIG_ARCH_TANGO) += \ dtb-$(CONFIG_ARCH_TANGO) += \
tango4-vantage-1172.dtb tango4-vantage-1172.dtb
dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \ dtb-$(CONFIG_ARCH_TEGRA_2x_SOC) += \

View File

@ -117,7 +117,7 @@ CONFIG_CFG80211_DEVELOPER_WARNINGS=y
# CONFIG_CFG80211_INTERNAL_REGDB is not set # CONFIG_CFG80211_INTERNAL_REGDB is not set
# CONFIG_CFG80211_REG_CELLULAR_HINTS is not set # CONFIG_CFG80211_REG_CELLULAR_HINTS is not set
# CONFIG_CFG80211_REG_RELAX_NO_IR is not set # CONFIG_CFG80211_REG_RELAX_NO_IR is not set
# CONFIG_CFG80211_WEXT is not set CONFIG_CFG80211_WEXT=y
CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKDEV_LOOKUP=y
CONFIG_CLKSRC_MMIO=y CONFIG_CLKSRC_MMIO=y
CONFIG_CLKSRC_OF=y CONFIG_CLKSRC_OF=y