summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2017-04-01 19:08:12 +0200
committerAmit Pundir <amit.pundir@linaro.org>2017-04-10 13:27:53 +0530
commit2168b67c0425f45e9fa6004ab19f9b6f5d561d52 (patch)
tree13a87b441e22fd96c7111bff39d1872660bcee14 /android
parentf91f25c224eead4166bbe96835ab04f13458585d (diff)
ANDROID: sort android-recommended.cfg
It got out-of-order, so resort it to make it easier to sync with other trees. Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'android')
-rw-r--r--android/configs/android-recommended.cfg4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/configs/android-recommended.cfg b/android/configs/android-recommended.cfg
index e346b378dd64..eecf8d80453a 100644
--- a/android/configs/android-recommended.cfg
+++ b/android/configs/android-recommended.cfg
@@ -7,8 +7,8 @@
# CONFIG_PM_WAKELOCKS_GC is not set
# CONFIG_VT is not set
CONFIG_ANDROID_TIMED_GPIO=y
-CONFIG_ARM_KERNMEM_PERMS=y
CONFIG_ARM64_SW_TTBR0_PAN=y
+CONFIG_ARM_KERNMEM_PERMS=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_BLK_DEV_DM=y
CONFIG_BLK_DEV_LOOP=y
@@ -97,6 +97,7 @@ CONFIG_LOGIRUMBLEPAD2_FF=y
CONFIG_LOGITECH_FF=y
CONFIG_MD=y
CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEMORY_STATE_TIME=y
CONFIG_MSDOS_FS=y
CONFIG_PANIC_TIMEOUT=5
CONFIG_PANTHERLORD_FF=y
@@ -126,7 +127,6 @@ CONFIG_TIMER_STATS=y
CONFIG_TMPFS=y
CONFIG_TMPFS_POSIX_ACL=y
CONFIG_UHID=y
-CONFIG_MEMORY_STATE_TIME=y
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
CONFIG_USB_EHCI_HCD=y
CONFIG_USB_HIDDEV=y