Merge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6

* 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  Introduce ARCH_NO_SYSDEV_OPS config option (v2)
  cpufreq: Use syscore_ops for boot CPU suspend/resume (v2)
  KVM: Use syscore_ops instead of sysdev class and sysdev
  PCI / Intel IOMMU: Use syscore_ops instead of sysdev class and sysdev
  timekeeping: Use syscore_ops instead of sysdev class and sysdev
  x86: Use syscore_ops instead of sysdev classes and sysdevs

1 files changed, 5 insertions, 2 deletions

diff --git a/include/linux/sysdev.h b/include/linux/sysdev.h
index 1154c29f4101..8a75da551e4e 100644
--- a/include/linux/sysdev.h
+++ b/include/linux/sysdev.h
@@ -33,12 +33,13 @@ struct sysdev_class {
         const char *name;
         struct list_head        drivers;
         struct sysdev_class_attribute **attrs;
-
+        struct kset             kset;
+#ifndef CONFIG_ARCH_NO_SYSDEV_OPS
         /* Default operations for these types of devices */
         int     (*shutdown)(struct sys_device *);
         int     (*suspend)(struct sys_device *, pm_message_t state);
         int     (*resume)(struct sys_device *);
-        struct kset             kset;
+#endif
 };
 
 struct sysdev_class_attribute {
@@ -76,9 +77,11 @@ struct sysdev_driver {
         struct list_head        entry;
         int     (*add)(struct sys_device *);
         int     (*remove)(struct sys_device *);
+#ifndef CONFIG_ARCH_NO_SYSDEV_OPS
         int     (*shutdown)(struct sys_device *);
         int     (*suspend)(struct sys_device *, pm_message_t state);
         int     (*resume)(struct sys_device *);
+#endif
 };