Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...

[pandora-kernel.git] / arch / blackfin / mach-common / dpmc_modes.S

diff --git a/arch/blackfin/mach-common/dpmc_modes.S b/arch/blackfin/mach-common/dpmc_modes.S
index 5969d86..9cfdd49 100644 (file)
--- a/arch/blackfin/mach-common/dpmc_modes.S
+++ b/arch/blackfin/mach-common/dpmc_modes.S
@@ -292,13 +292,7 @@ ENTRY(_do_hibernate)
 #ifdef SIC_IMASK
        PM_SYS_PUSH(SIC_IMASK)
 #endif
-#ifdef SICA_IMASK0
-       PM_SYS_PUSH(SICA_IMASK0)
-#endif
-#ifdef SICA_IMASK1
-       PM_SYS_PUSH(SICA_IMASK1)
-#endif
-#ifdef SIC_IAR2
+#ifdef SIC_IAR0
        PM_SYS_PUSH(SIC_IAR0)
        PM_SYS_PUSH(SIC_IAR1)
        PM_SYS_PUSH(SIC_IAR2)
@@ -321,17 +315,6 @@ ENTRY(_do_hibernate)
        PM_SYS_PUSH(SIC_IAR11)
 #endif
 
-#ifdef SICA_IAR0
-       PM_SYS_PUSH(SICA_IAR0)
-       PM_SYS_PUSH(SICA_IAR1)
-       PM_SYS_PUSH(SICA_IAR2)
-       PM_SYS_PUSH(SICA_IAR3)
-       PM_SYS_PUSH(SICA_IAR4)
-       PM_SYS_PUSH(SICA_IAR5)
-       PM_SYS_PUSH(SICA_IAR6)
-       PM_SYS_PUSH(SICA_IAR7)
-#endif
-
 #ifdef SIC_IWR
        PM_SYS_PUSH(SIC_IWR)
 #endif
@@ -344,12 +327,6 @@ ENTRY(_do_hibernate)
 #ifdef SIC_IWR2
        PM_SYS_PUSH(SIC_IWR2)
 #endif
-#ifdef SICA_IWR0
-       PM_SYS_PUSH(SICA_IWR0)
-#endif
-#ifdef SICA_IWR1
-       PM_SYS_PUSH(SICA_IWR1)
-#endif
 
 #ifdef PINT0_ASSIGN
        PM_SYS_PUSH(PINT0_MASK_SET)
@@ -750,12 +727,6 @@ ENTRY(_do_hibernate)
        PM_SYS_POP(PINT0_MASK_SET)
 #endif
 
-#ifdef SICA_IWR1
-       PM_SYS_POP(SICA_IWR1)
-#endif
-#ifdef SICA_IWR0
-       PM_SYS_POP(SICA_IWR0)
-#endif
 #ifdef SIC_IWR2
        PM_SYS_POP(SIC_IWR2)
 #endif
@@ -769,17 +740,6 @@ ENTRY(_do_hibernate)
        PM_SYS_POP(SIC_IWR)
 #endif
 
-#ifdef SICA_IAR0
-       PM_SYS_POP(SICA_IAR7)
-       PM_SYS_POP(SICA_IAR6)
-       PM_SYS_POP(SICA_IAR5)
-       PM_SYS_POP(SICA_IAR4)
-       PM_SYS_POP(SICA_IAR3)
-       PM_SYS_POP(SICA_IAR2)
-       PM_SYS_POP(SICA_IAR1)
-       PM_SYS_POP(SICA_IAR0)
-#endif
-
 #ifdef SIC_IAR8
        PM_SYS_POP(SIC_IAR11)
        PM_SYS_POP(SIC_IAR10)
@@ -797,17 +757,11 @@ ENTRY(_do_hibernate)
 #ifdef SIC_IAR3
        PM_SYS_POP(SIC_IAR3)
 #endif
-#ifdef SIC_IAR2
+#ifdef SIC_IAR0
        PM_SYS_POP(SIC_IAR2)
        PM_SYS_POP(SIC_IAR1)
        PM_SYS_POP(SIC_IAR0)
 #endif
-#ifdef SICA_IMASK1
-       PM_SYS_POP(SICA_IMASK1)
-#endif
-#ifdef SICA_IMASK0
-       PM_SYS_POP(SICA_IMASK0)
-#endif
 #ifdef SIC_IMASK
        PM_SYS_POP(SIC_IMASK)
 #endif