From 80681fe1bd91a48abe3ed5029a3bc709d293127c Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 11 Oct 2007 10:47:49 -0600
Subject: [PATCH] --- yaml --- r: 68004 b: refs/heads/master c:
 e89a4116ef345cf10c21f722dd1d8bfa9b7c7d58 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/firmware/edd.c     | 4 ++--
 trunk/drivers/firmware/efivars.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f69a2bb2744a..797505466152 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1148fb03f3c5d0bb5e6641234c2251a15741361
+refs/heads/master: e89a4116ef345cf10c21f722dd1d8bfa9b7c7d58
diff --git a/trunk/drivers/firmware/edd.c b/trunk/drivers/firmware/edd.c
index 0fb730ee1da8..6942e065e609 100644
--- a/trunk/drivers/firmware/edd.c
+++ b/trunk/drivers/firmware/edd.c
@@ -625,13 +625,13 @@ static void edd_release(struct kobject * kobj)
 	kfree(dev);
 }
 
-static struct kobj_type ktype_edd = {
+static struct kobj_type edd_ktype = {
 	.release	= edd_release,
 	.sysfs_ops	= &edd_attr_ops,
 	.default_attrs	= def_attrs,
 };
 
-static decl_subsys(edd,&ktype_edd,NULL);
+static decl_subsys(edd, &edd_ktype, NULL);
 
 
 /**
diff --git a/trunk/drivers/firmware/efivars.c b/trunk/drivers/firmware/efivars.c
index bfd2d67df689..858a7b95933b 100644
--- a/trunk/drivers/firmware/efivars.c
+++ b/trunk/drivers/firmware/efivars.c
@@ -402,7 +402,7 @@ static struct attribute *def_attrs[] = {
 	NULL,
 };
 
-static struct kobj_type ktype_efivar = {
+static struct kobj_type efivar_ktype = {
 	.release = efivar_release,
 	.sysfs_ops = &efivar_attr_ops,
 	.default_attrs = def_attrs,
@@ -583,7 +583,7 @@ static struct subsys_attribute *efi_subsys_attrs[] = {
 	NULL,	/* maybe more in the future? */
 };
 
-static decl_subsys(vars, &ktype_efivar, NULL);
+static decl_subsys(vars, &efivar_ktype, NULL);
 static decl_subsys(efi, NULL, NULL);
 
 /*