Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[pandora-kernel.git] / drivers / base / hypervisor.c

diff --git a/drivers/base/hypervisor.c b/drivers/base/hypervisor.c
index 0c85e9d..6428cba 100644 (file)
--- a/drivers/base/hypervisor.c
+++ b/drivers/base/hypervisor.c
@@ -1,19 +1,24 @@
 /*
  * hypervisor.c - /sys/hypervisor subsystem.
  *
- * This file is released under the GPLv2
+ * Copyright (C) IBM Corp. 2006
+ * Copyright (C) 2007 Greg Kroah-Hartman <gregkh@suse.de>
+ * Copyright (C) 2007 Novell Inc.
  *
+ * This file is released under the GPLv2
  */
 
 #include <linux/kobject.h>
 #include <linux/device.h>
-
 #include "base.h"
 
-decl_subsys(hypervisor, NULL, NULL);
-EXPORT_SYMBOL_GPL(hypervisor_subsys);
+struct kobject *hypervisor_kobj;
+EXPORT_SYMBOL_GPL(hypervisor_kobj);
 
 int __init hypervisor_init(void)
 {
-       return subsystem_register(&hypervisor_subsys);
+       hypervisor_kobj = kobject_create_and_add("hypervisor", NULL);
+       if (!hypervisor_kobj)
+               return -ENOMEM;
+       return 0;
 }