Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.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 f91c3b7bc6558f89e918f76e7a790fe28d6d89b9..8736afff82f3e8bec970c406d1b89844d9fef2a4 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);