summaryrefslogtreecommitdiffstats
path: root/kernel-arm64.patch
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@fedoraproject.org>2014-10-26 10:06:02 -0400
committerJosh Boyer <jwboyer@fedoraproject.org>2014-10-26 10:06:25 -0400
commitf42901a61c6ea263b77f8e0413b1350a76d987a4 (patch)
tree0f7c4b9227a0f03ab0813130c1387ebf281da13e /kernel-arm64.patch
parentdf84d54e058b5901f4f8faa10bbe979fe913f771 (diff)
downloadkernel-f42901a61c6ea263b77f8e0413b1350a76d987a4.tar.gz
kernel-f42901a61c6ea263b77f8e0413b1350a76d987a4.tar.xz
kernel-f42901a61c6ea263b77f8e0413b1350a76d987a4.zip
Linux v3.18-rc1-422-g2cc91884b6b3
Diffstat (limited to 'kernel-arm64.patch')
-rw-r--r--kernel-arm64.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel-arm64.patch b/kernel-arm64.patch
index 6e2491207..c2464c89d 100644
--- a/kernel-arm64.patch
+++ b/kernel-arm64.patch
@@ -1853,9 +1853,9 @@ index ac9afde..14423f3 100644
config ARM64
def_bool y
+ select ACPI_REDUCED_HARDWARE_ONLY if ACPI
+ select ARCH_BINFMT_ELF_RANDOMIZE_PIE
select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
select ARCH_HAS_SG_CHAIN
- select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
@@ -267,6 +268,9 @@ config SMP
If you don't know what to do here, say N.
@@ -3194,13 +3194,13 @@ index 505d4d7..252d0ff 100644
acpi-y += acpi_lpss.o
acpi-y += acpi_platform.o
acpi-y += acpi_pnp.o
+ acpi-y += int340x_thermal.o
acpi-y += power.o
acpi-y += event.o
acpi-y += sysfs.o
+acpi-y += property.o
acpi-$(CONFIG_X86) += acpi_cmos_rtc.o
acpi-$(CONFIG_DEBUG_FS) += debugfs.o
- acpi-$(CONFIG_ACPI_NUMA) += numa.o
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
index 8b67bd0..c412fdb 100644
--- a/drivers/acpi/bus.c