openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'msm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup 

* 'msm-core' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
  ARM: msm: fix compilation flags for MSM_SCM (part 2)
  arch/arm/mach-msm: linux/gpio.h included twice
  ARM: msm: Drop useless teq from DEBUG_LL support
This commit is contained in:
Olof Johansson 2012-05-11 22:31:02 -07:00
parent eb9eef616b 26e87b1383
commit 243e095446
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-msm/board-msm7x30.c
View File

@ -17,7 +17,6 @@
#include <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/irq.h>
#include <linux/gpio.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
#include <linux/io.h>

1
arch/arm/mach-msm/board-qsd8x50.c
View File

@ -17,7 +17,6 @@
#include <linux/gpio.h>
#include <linux/kernel.h>
#include <linux/irq.h>
#include <linux/gpio.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
#include <linux/usb/msm_hsusb.h>

3
arch/arm/mach-msm/include/mach/debug-macro.S
View File

@ -30,8 +30,7 @@
@ Write the 1 character to UARTDM_TF
str \rd, [\rx, #0x70]
#else
teq \rx, #0
strne \rd, [\rx, #0x0C]
str \rd, [\rx, #0x0C]
#endif
.endm

3
arch/arm/mach-msm/scm.c
View File

@ -282,6 +282,9 @@ u32 scm_get_version(void)
__asmeq("%1", "r1")
__asmeq("%2", "r0")
__asmeq("%3", "r1")
#ifdef REQUIRES_SEC
".arch_extension sec\n"
#endif
"smc #0 @ switch to secure world\n"
: "=r" (r0), "=r" (r1)
: "r" (r0), "r" (r1)