diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-08 12:01:16 -0600 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2013-11-08 12:01:16 -0600 |
| commit | 5caca6fd8ad5ad90307a1d3519b160a6eb347c4b (patch) | |
| tree | 52832afb6c8cd7e99bf6a8904e1451a8dc5464cd | |
| parent | a44933efb6f77c696dabf657c6e57e5602366624 (diff) | |
| parent | 8cb8d3a0db0d94e6a7349a5e82fe8e7a8ffd60d0 (diff) | |
Merge branch 'lng-board-configs' into linux-lng
| -rw-r--r-- | linaro/configs/arndale.conf | 3 | ||||
| -rw-r--r-- | linaro/configs/highbank.conf | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/linaro/configs/arndale.conf b/linaro/configs/arndale.conf index 3a6c510f24a5..0add02ee1460 100644 --- a/linaro/configs/arndale.conf +++ b/linaro/configs/arndale.conf @@ -42,6 +42,7 @@ CONFIG_CPU_THERMAL=y CONFIG_EXYNOS_THERMAL=y CONFIG_MFD_SEC_CORE=y CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_S5M8767=y CONFIG_USB=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y @@ -58,6 +59,7 @@ CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_EXYNOS=y CONFIG_USB_STORAGE=y CONFIG_SAMSUNG_USBPHY=y +CONFIG_USB_HSIC_USB3503=y CONFIG_USB_GADGET=y CONFIG_MMC=y CONFIG_MMC_UNSAFE_RESUME=y @@ -71,3 +73,4 @@ CONFIG_DEBUG_SPINLOCK=y CONFIG_DEBUG_INFO=y CONFIG_RCU_CPU_STALL_TIMEOUT=60 CONFIG_DEBUG_USER=y +CONFIG_TUN=y diff --git a/linaro/configs/highbank.conf b/linaro/configs/highbank.conf index bf0f3c14b0d0..33b978128777 100644 --- a/linaro/configs/highbank.conf +++ b/linaro/configs/highbank.conf @@ -1,5 +1,7 @@ CONFIG_EXPERIMENTAL=y CONFIG_NO_HZ=y +CONFIG_HIGHMEM=y +CONFIG_HIGHPTE=y CONFIG_HIGH_RES_TIMERS=y CONFIG_ARCH_HIGHBANK=y CONFIG_ARM_ERRATA_754322=y |