Commit 5bf9423e authored Aug 04, 2015 by Kevin Hilman

Merge branch 'linaro-android-3.18-lsk' of...

Merge branch 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-v3.18-android

* 'linaro-android-3.18-lsk' of git://android.git.linaro.org/kernel/linaro-android:
  android: configs: base: enable USB_CONFIGFS
  arm64: move mixed endian EL0 declarations under __ASSEMBLY__ guards

parents a06f7d9e d86b81d4

android/configs/android-base.cfg

+1 −1

Original line number	Diff line number	Diff line
		@@ -149,6 +149,6 @@ CONFIG_SYSVIPC=y
		CONFIG_TUN=y
		CONFIG_UNIX=y
		CONFIG_USB_GADGET=y
		CONFIG_USB_G_ANDROID=y
		CONFIG_USB_CONFIGFS=y
		CONFIG_USB_OTG_WAKELOCK=y
		CONFIG_XFRM_USER=y