diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-08-04 14:41:36 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-08-04 14:41:36 -0700 |
| commit | 5bf9423e95a9e34c26d02f289337fe0b0aa9ada2 (patch) | |
| tree | f6e2cf8e8aa70d19bd4de675b91267856b3775b6 /android | |
| parent | a06f7d9e6f2702b2726f43ecd1f9808d56e39630 (diff) | |
| parent | d86b81d4d5f700610182ce19d9ba646303fe16bb (diff) | |
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
Diffstat (limited to 'android')
| -rw-r--r-- | android/configs/android-base.cfg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg index ad32ede883b9..07fe39fc9c2a 100644 --- a/android/configs/android-base.cfg +++ b/android/configs/android-base.cfg @@ -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 |