diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-05 07:21:56 +0100 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-03-05 07:21:56 +0100 |
commit | 414a8a5a965d445a91df309574438355e5f448d4 (patch) | |
tree | 0d45f29b9606ecc6275bc095857bbe1e3d703572 /kernel-aarch64.config | |
parent | f362aa1d3a9a2fe44195caf5ddf9e142bc187388 (diff) | |
parent | 49df7433692ff4d6d595dd27cb20c448c00e7e59 (diff) | |
download | kernel-4.16.0-0.rc4.git0.1.vanilla.knurd.1.fc29.tar.gz kernel-4.16.0-0.rc4.git0.1.vanilla.knurd.1.fc29.tar.xz kernel-4.16.0-0.rc4.git0.1.vanilla.knurd.1.fc29.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.16.0-0.rc4.git0.1.vanilla.knurd.1.fc29kernel-4.16.0-0.rc4.git0.1.vanilla.knurd.1.fc28kernel-4.16.0-0.rc4.git0.1.vanilla.knurd.1.fc27kernel-4.16.0-0.rc4.git0.1.vanilla.knurd.1.fc26
Diffstat (limited to 'kernel-aarch64.config')
-rw-r--r-- | kernel-aarch64.config | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel-aarch64.config b/kernel-aarch64.config index c48f5703a..58c7d48b4 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -305,6 +305,7 @@ CONFIG_ARM_PSCI=y # CONFIG_ARM_PTDUMP is not set CONFIG_ARM_RK3399_DMC_DEVFREQ=m CONFIG_ARM_SBSA_WATCHDOG=m +# CONFIG_ARM_SCPI_CPUFREQ is not set CONFIG_ARM_SCPI_POWER_DOMAIN=m CONFIG_ARM_SCPI_PROTOCOL=m CONFIG_ARM_SDE_INTERFACE=y @@ -1792,6 +1793,7 @@ CONFIG_GPIO_PCF857X=m CONFIG_GPIO_PCI_IDIO_16=m # CONFIG_GPIO_PISOSR is not set CONFIG_GPIO_PL061=y +CONFIG_GPIO_RASPBERRYPI_EXP=m # CONFIG_GPIO_RDC321X is not set # CONFIG_GPIO_SCH311X is not set # CONFIG_GPIO_SX150X is not set @@ -5781,7 +5783,6 @@ CONFIG_TIFM_CORE=m CONFIG_TIGON3_HWMON=y CONFIG_TIGON3=m # CONFIG_TIMB_DMA is not set -# CONFIG_TIMER_STATS is not set CONFIG_TINYDRM_ILI9225=m CONFIG_TINYDRM_MI0283QT=m CONFIG_TINYDRM_MIPI_DBI=m @@ -6173,7 +6174,7 @@ CONFIG_USB_OHCI_HCD_PLATFORM=m # CONFIG_USB_OHCI_HCD_SSB is not set CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OTG_BLACKLIST_HUB is not set -# CONFIG_USB_OTG_FSM is not set +CONFIG_USB_OTG_FSM=m # CONFIG_USB_OTG_WHITELIST is not set CONFIG_USB_OTG=y # CONFIG_USB_OXU210HP_HCD is not set |