diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-09-05 13:11:06 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-09-05 13:11:04 -0700 |
| commit | a2c5ca327b447828300e9ffde4b7fb0a81223957 (patch) | |
| tree | 10fdf84404308a4ec4ef16848ed85e894c63d8c1 /arch/arm | |
| parent | 53eacca70d06c9410779ce3e1e705953fa8ba6fb (diff) | |
| parent | 0748a0e20318c4c5f7807f745e56c6256d6172cd (diff) | |
Merge "Merge android-4.4.190 (ac7fbca) into msm-4.4"
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-davinci/sleep.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/sleep.S b/arch/arm/mach-davinci/sleep.S index a5336a5e2739..459d081caf79 100644 --- a/arch/arm/mach-davinci/sleep.S +++ b/arch/arm/mach-davinci/sleep.S @@ -37,6 +37,7 @@ #define DEEPSLEEP_SLEEPENABLE_BIT BIT(31) .text + .arch armv5te /* * Move DaVinci into deep sleep state * |