summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@google.com>2017-04-04 19:50:20 +0200
committerGreg Kroah-Hartman <gregkh@google.com>2017-04-04 19:50:20 +0200
commit21afcf6ff8c745ab9c551f113eeaacff3f41b515 (patch)
treef2079bedfdbbe0ff9c64a381e62ea242805ceb68 /android
parent025b221d5309fe93280e765cf16ad4c8d2ce76c4 (diff)
ANDROID: android-base.cfg: properly sort the file
It somehow got out of alphabetical order, fix it to make merges and testing easier. Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'android')
-rw-r--r--android/configs/android-base.cfg12
1 files changed, 6 insertions, 6 deletions
diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg
index ece06816e046..a1969d0d7926 100644
--- a/android/configs/android-base.cfg
+++ b/android/configs/android-base.cfg
@@ -8,8 +8,8 @@
# CONFIG_SYSVIPC is not set
# CONFIG_USELIB is not set
CONFIG_ANDROID=y
-CONFIG_ANDROID_BINDER_IPC=y
CONFIG_ANDROID_BINDER_DEVICES=binder,hwbinder,vndbinder
+CONFIG_ANDROID_BINDER_IPC=y
CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ARMV8_DEPRECATED=y
CONFIG_ASHMEM=y
@@ -140,9 +140,9 @@ CONFIG_PREEMPT=y
CONFIG_PROFILING=y
CONFIG_QFMT_V2=y
CONFIG_QUOTA=y
+CONFIG_QUOTACTL=y
CONFIG_QUOTA_NETLINK_INTERFACE=y
CONFIG_QUOTA_TREE=y
-CONFIG_QUOTACTL=y
CONFIG_RANDOMIZE_BASE=y
CONFIG_RTC_CLASS=y
CONFIG_RT_GROUP_SCHED=y
@@ -158,14 +158,14 @@ CONFIG_SYNC=y
CONFIG_TUN=y
CONFIG_UID_SYS_STATS=y
CONFIG_UNIX=y
-CONFIG_USB_GADGET=y
CONFIG_USB_CONFIGFS=y
+CONFIG_USB_CONFIGFS_F_ACC=y
+CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
CONFIG_USB_CONFIGFS_F_MTP=y
CONFIG_USB_CONFIGFS_F_PTP=y
-CONFIG_USB_CONFIGFS_F_ACC=y
-CONFIG_USB_CONFIGFS_F_AUDIO_SRC=y
CONFIG_USB_CONFIGFS_UEVENT=y
-CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_GADGET=y
CONFIG_USB_OTG_WAKELOCK=y
CONFIG_XFRM_USER=y