diff options
author | Peter Robinson <pbrobinson@gmail.com> | 2016-03-21 13:40:55 +0000 |
---|---|---|
committer | Peter Robinson <pbrobinson@gmail.com> | 2016-03-21 13:40:55 +0000 |
commit | 8bfaf21554139852241a32d7dbb9e2a2a4a17b03 (patch) | |
tree | fc4fbb23489cd1c68af5dc6ab0e34a35b427ca82 | |
parent | da001e90887604dd0244312a3c0ab94a4fd8c889 (diff) | |
download | kernel-8bfaf21554139852241a32d7dbb9e2a2a4a17b03.tar.gz kernel-8bfaf21554139852241a32d7dbb9e2a2a4a17b03.tar.xz kernel-8bfaf21554139852241a32d7dbb9e2a2a4a17b03.zip |
Minor aarch64 cleanups
-rw-r--r-- | config-arm64 | 8 | ||||
-rw-r--r-- | kernel.spec | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/config-arm64 b/config-arm64 index 4f98e9df6..07549aefe 100644 --- a/config-arm64 +++ b/config-arm64 @@ -85,8 +85,7 @@ CONFIG_SPARSEMEM_VMEMMAP=y # CONFIG_SYS_HYPERVISOR is not set -# CONFIG_ARM_SBSA_WATCHDOG is not set - +CONFIG_ARM_SBSA_WATCHDOG=m CONFIG_RTC_DRV_EFI=y CONFIG_ACPI=y @@ -181,6 +180,9 @@ CONFIG_NVMEM_SUNXI_SID=m # ThunderX # CONFIG_MDIO_OCTEON is not set +# CONFIG_MDIO_THUNDER is not set +# CONFIG_PCI_HOST_THUNDER_PEM is not set +# CONFIG_PCI_HOST_THUNDER_ECAM is not set CONFIG_DMI=y CONFIG_DMIID=y @@ -210,8 +212,6 @@ CONFIG_DEBUG_SECTION_MISMATCH=y # CONFIG_VGA_CONSOLE is not set # CONFIG_HOTPLUG_PCI_SHPC is not set -# CONFIG_PCI_HOST_THUNDER_PEM is not set -# CONFIG_PCI_HOST_THUNDER_ECAM is not set # CONFIG_FSL_MC_BUS is not set # CONFIG_FUJITSU_ES is not set diff --git a/kernel.spec b/kernel.spec index ca7587e7f..add95cd84 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2153,6 +2153,9 @@ fi # # %changelog +* Mon Mar 21 2016 Peter Robinson <pbrobinson@fedoraproject.org> +- Minor aarch64 cleanups + * Mon Mar 21 2016 Josh Boyer <jwboyer@fedoraproject.org> - 4.6.0-0.rc0.git14.1 - Linux v4.5-8524-g1e75a9f34a5e - watchdog, firewire, vfs, linux-arm, sh, powerpc, audit, device tree merges |