diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-04-19 04:07:14 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-04-19 04:07:14 +0300 |
| commit | 856ee92e8602bd86d34388ac08381c5cb3918756 (patch) | |
| tree | c3bed2bf85214f78239724adb34a1c2d6ec8444d /arch/arm/mach-omap2/omap-smc.S | |
| parent | a6a5c983b35e579071370d4eb2b4ed8ad5c18da9 (diff) | |
| parent | 4f7d029b9bf009fbee76bb10c0c4351a1870d2f3 (diff) | |
| download | linux-856ee92e8602bd86d34388ac08381c5cb3918756.tar.xz | |
Merge tag 'v4.11-rc7' into drm-next
Backmerge Linux 4.11-rc7 from Linus tree, to fix some
conflicts that were causing problems with the rerere cache
in drm-tip.
Diffstat (limited to 'arch/arm/mach-omap2/omap-smc.S')
| -rw-r--r-- | arch/arm/mach-omap2/omap-smc.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/omap-smc.S b/arch/arm/mach-omap2/omap-smc.S index fd90125bffc7..72506e6cf9e7 100644 --- a/arch/arm/mach-omap2/omap-smc.S +++ b/arch/arm/mach-omap2/omap-smc.S @@ -94,6 +94,5 @@ ENTRY(omap_read_auxcoreboot0) ldr r12, =0x103 dsb smc #0 - mov r0, r0, lsr #9 ldmfd sp!, {r2-r12, pc} ENDPROC(omap_read_auxcoreboot0) |