git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-msm
/
smd_debug.c
diff --git
a/arch/arm/mach-msm/smd_debug.c
b/arch/arm/mach-msm/smd_debug.c
index
f91c3b7
..
8736aff
100644
(file)
--- a/
arch/arm/mach-msm/smd_debug.c
+++ b/
arch/arm/mach-msm/smd_debug.c
@@
-270,8
+270,10
@@
void smsm_print_sleep_info(void)
{
unsigned long flags;
uint32_t *ptr;
+#ifndef CONFIG_ARCH_MSM_SCORPION
struct tramp_gpio_smem *gpio;
struct smsm_interrupt_info *int_info;
+#endif
spin_lock_irqsave(&smem_lock, flags);