vserver 1.9.5.x5

[linux-2.6.git] / arch / arm / mach-sa1100 / neponset.c

diff --git a/arch/arm/mach-sa1100/neponset.c b/arch/arm/mach-sa1100/neponset.c
index a747fd0..e3dc138 100644 (file)
--- a/arch/arm/mach-sa1100/neponset.c
+++ b/arch/arm/mach-sa1100/neponset.c
@@ -173,6 +173,8 @@ static int neponset_probe(struct device *dev)
        return 0;
 }
 
+#ifdef CONFIG_PM
+
 /*
  * LDM power management.
  */
@@ -184,12 +186,12 @@ static int neponset_suspend(struct device *dev, u32 state, u32 level)
        if (level == SUSPEND_SAVE_STATE ||
            level == SUSPEND_DISABLE ||
            level == SUSPEND_POWER_DOWN) {
-               if (!dev->saved_state)
-                       dev->saved_state = kmalloc(sizeof(unsigned int), GFP_KERNEL);
-               if (!dev->saved_state)
+               if (!dev->power.saved_state)
+                       dev->power.saved_state = kmalloc(sizeof(unsigned int), GFP_KERNEL);
+               if (!dev->power.saved_state)
                        return -ENOMEM;
 
-               *(unsigned int *)dev->saved_state = NCR_0;
+               *(unsigned int *)dev->power.saved_state = NCR_0;
        }
 
        return 0;
@@ -198,16 +200,21 @@ static int neponset_suspend(struct device *dev, u32 state, u32 level)
 static int neponset_resume(struct device *dev, u32 level)
 {
        if (level == RESUME_RESTORE_STATE || level == RESUME_ENABLE) {
-               if (dev->saved_state) {
-                       NCR_0 = *(unsigned int *)dev->saved_state;
-                       kfree(dev->saved_state);
-                       dev->saved_state = NULL;
+               if (dev->power.saved_state) {
+                       NCR_0 = *(unsigned int *)dev->power.saved_state;
+                       kfree(dev->power.saved_state);
+                       dev->power.saved_state = NULL;
                }
        }
 
        return 0;
 }
 
+#else
+#define neponset_suspend NULL
+#define neponset_resume  NULL
+#endif
+
 static struct device_driver neponset_device_driver = {
        .name           = "neponset",
        .bus            = &platform_bus_type,