ARM: S3C64XX: DMA: Free node for non-circular queues

[safe/jmp/linux-2.6] / arch / arm / mach-omap1 / pm.c

diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 742f79e..5218943 100644 (file)
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -41,23 +41,23 @@
 #include <linux/interrupt.h>
 #include <linux/sysfs.h>
 #include <linux/module.h>
+#include <linux/io.h>
 
-#include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/atomic.h>
 #include <asm/mach/time.h>
 #include <asm/mach/irq.h>
-#include <asm/mach-types.h>
-
-#include <asm/arch/cpu.h>
-#include <asm/arch/irqs.h>
-#include <asm/arch/clock.h>
-#include <asm/arch/sram.h>
-#include <asm/arch/tc.h>
-#include <asm/arch/pm.h>
-#include <asm/arch/mux.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/dmtimer.h>
+
+#include <mach/cpu.h>
+#include <mach/irqs.h>
+#include <mach/clock.h>
+#include <mach/sram.h>
+#include <mach/tc.h>
+#include <mach/mux.h>
+#include <mach/dma.h>
+#include <mach/dmtimer.h>
+
+#include "pm.h"
 
 static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE];
 static unsigned short dsp_sleep_save[DSP_SLEEP_SAVE_SIZE];
@@ -102,7 +102,7 @@ static void (*omap_sram_suspend)(unsigned long r0, unsigned long r1) = NULL;
  * going idle we continue to do idle even if we get
  * a clock tick interrupt . .
  */
-void omap_pm_idle(void)
+void omap1_pm_idle(void)
 {
        extern __u32 arm_idlect1_mask;
        __u32 use_idlect1 = arm_idlect1_mask;
@@ -223,11 +223,12 @@ static void omap_pm_wakeup_setup(void)
 #define EN_APICK       6       /* ARM_IDLECT2 */
 #define DSP_EN         1       /* ARM_RSTCT1 */
 
-void omap_pm_suspend(void)
+void omap1_pm_suspend(void)
 {
        unsigned long arg0 = 0, arg1 = 0;
 
-       printk("PM: OMAP%x is trying to enter deep sleep...\n", system_rev);
+       printk(KERN_INFO "PM: OMAP%x is trying to enter deep sleep...\n",
+               omap_rev());
 
        omap_serial_wake_trigger(1);
 
@@ -422,7 +423,8 @@ void omap_pm_suspend(void)
 
        omap_serial_wake_trigger(0);
 
-       printk("PM: OMAP%x is re-starting from deep sleep...\n", system_rev);
+       printk(KERN_INFO "PM: OMAP%x is re-starting from deep sleep...\n",
+               omap_rev());
 }
 
 #if defined(DEBUG) && defined(CONFIG_PROC_FS)
@@ -609,7 +611,7 @@ static int omap_pm_enter(suspend_state_t state)
        {
        case PM_SUSPEND_STANDBY:
        case PM_SUSPEND_MEM:
-               omap_pm_suspend();
+               omap1_pm_suspend();
                break;
        default:
                return -EINVAL;
@@ -682,7 +684,7 @@ static int __init omap_pm_init(void)
                return -ENODEV;
        }
 
-       pm_idle = omap_pm_idle;
+       pm_idle = omap1_pm_idle;
 
        if (cpu_is_omap730())
                setup_irq(INT_730_WAKE_UP_REQ, &omap_wakeup_irq);