diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-12 05:31:02 (GMT) |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-12 05:31:02 (GMT) |
| commit | 243e095446c12082f961ef15709927ccb8ea0cc1 (patch) | |
| tree | a97261913499975cdcc26da189d775198d5e01ea /arch/arm/mach-msm | |
| parent | eb9eef616b0ce14d554f75da197c0bfee8d2132f (diff) | |
| parent | 26e87b13834f04fc209e887f124e8ef4f3ca526c (diff) | |
| download | linux-243e095446c12082f961ef15709927ccb8ea0cc1.tar.xz | |
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
Diffstat (limited to 'arch/arm/mach-msm')
| -rw-r--r-- | arch/arm/mach-msm/board-msm7x30.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-msm/board-qsd8x50.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-msm/include/mach/debug-macro.S | 3 | ||||
| -rw-r--r-- | arch/arm/mach-msm/scm.c | 3 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c index db81ed5..75b3cfc 100644 --- a/arch/arm/mach-msm/board-msm7x30.c +++ b/arch/arm/mach-msm/board-msm7x30.c @@ -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> diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c index 7e8909c..fbaa4ed 100644 --- a/arch/arm/mach-msm/board-qsd8x50.c +++ b/arch/arm/mach-msm/board-qsd8x50.c @@ -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> diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S index 3ffd866..0e05f88 100644 --- a/arch/arm/mach-msm/include/mach/debug-macro.S +++ b/arch/arm/mach-msm/include/mach/debug-macro.S @@ -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 diff --git a/arch/arm/mach-msm/scm.c b/arch/arm/mach-msm/scm.c index bafabb5..c536fd6 100644 --- a/arch/arm/mach-msm/scm.c +++ b/arch/arm/mach-msm/scm.c @@ -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) |