aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGraeme Gregory <graeme.gregory@linaro.org>2013-12-04 12:17:05 +0000
committerGraeme Gregory <graeme.gregory@linaro.org>2013-12-04 12:17:05 +0000
commit5634dbe9f9afaf1faf7cd15602d584be61725785 (patch)
treefa2e9c879286110840e16c52be86ad18fb5191ab
parent1dda56f1cc8698c07308eaf2facb29480fdee3c0 (diff)
parent7f7d24919b113152ff02bbd786d221d1f5f3ac0f (diff)
downloadleg-kernel-5634dbe9f9afaf1faf7cd15602d584be61725785.tar.gz
Merge branch 'leg-conf-fragments-llct-20131112.0' of git://git.linaro.org/arm/acpi/acpi into leg-kernel
Conflicts: linaro/configs/acpi.conf
-rw-r--r--linaro/configs/acpi.conf2
-rw-r--r--linaro/configs/efi.conf2
2 files changed, 3 insertions, 1 deletions
diff --git a/linaro/configs/acpi.conf b/linaro/configs/acpi.conf
index 2005afabe4c8..e9a0b062a830 100644
--- a/linaro/configs/acpi.conf
+++ b/linaro/configs/acpi.conf
@@ -18,4 +18,4 @@ CONFIG_ACPI_BLACKLIST_YEAR=0
CONFIG_ACPI_CONTAINER=y
CONFIG_ACPI_SBS=y
CONFIG_ACPI_HED=y
-
+CONFIG_ACPI_USE_CHOSEN_NODE=y
diff --git a/linaro/configs/efi.conf b/linaro/configs/efi.conf
new file mode 100644
index 000000000000..d12f687b0367
--- /dev/null
+++ b/linaro/configs/efi.conf
@@ -0,0 +1,2 @@
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y