aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firmware
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2007-11-05 16:16:15 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2008-01-24 23:40:23 -0500
commitf62ed9e33b3ccff54d66b08f82d11940bb9e269b (patch)
tree730e79fe5e1c38a0a277b075405d6671b8e450fe /drivers/firmware
parent15f2f9b3a9db65aaf908fe7ee17bbe262ae3550f (diff)
firmware: change firmware_kset to firmware_kobj
There is no firmware "subsystem" it's just a directory in /sys that other portions of the kernel want to hook into. So make it a kobject not a kset to help alivate anyone who tries to do some odd kset-like things with this. Cc: Kay Sievers <kay.sievers@vrfy.org> Cc: Cornelia Huck <cornelia.huck@de.ibm.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/edd.c2
-rw-r--r--drivers/firmware/efivars.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/edd.c b/drivers/firmware/edd.c
index f07f37047cd1..ddcc95793068 100644
--- a/drivers/firmware/edd.c
+++ b/drivers/firmware/edd.c
@@ -756,7 +756,7 @@ edd_init(void)
756 return 1; 756 return 1;
757 } 757 }
758 758
759 edd_kset = kset_create_and_add("edd", NULL, &firmware_kset->kobj); 759 edd_kset = kset_create_and_add("edd", NULL, firmware_kobj);
760 if (!edd_kset) 760 if (!edd_kset)
761 return -ENOMEM; 761 return -ENOMEM;
762 762
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index e17cd8133548..d1ad48190afc 100644
--- a/drivers/firmware/efivars.c
+++ b/drivers/firmware/efivars.c
@@ -668,7 +668,7 @@ efivars_init(void)
668 /* 668 /*
669 * For now we'll register the efi subsys within this driver 669 * For now we'll register the efi subsys within this driver
670 */ 670 */
671 efi_kset = kset_create_and_add("efi", NULL, &firmware_kset->kobj); 671 efi_kset = kset_create_and_add("efi", NULL, firmware_kobj);
672 if (!efi_kset) { 672 if (!efi_kset) {
673 printk(KERN_ERR "efivars: Firmware registration failed.\n"); 673 printk(KERN_ERR "efivars: Firmware registration failed.\n");
674 error = -ENOMEM; 674 error = -ENOMEM;