From 2278090759b305309ce7cfc117992a19e54f28d1 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 2 Nov 2007 16:19:59 -0700
Subject: [PATCH] --- yaml --- r: 75779 b: refs/heads/master c:
 15f2f9b3a9db65aaf908fe7ee17bbe262ae3550f h: refs/heads/master i:   75777:
 8f4621cf30f6ef2da443ea2803fc1d9adf351302   75775:
 83ddbd32c4004ae363f003b1507ba7d908a37498 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/base/firmware.c | 19 ++-----------------
 trunk/include/linux/device.h  |  5 -----
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index 0ccefc378bd3..20bfb1d50a9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99e0d2fc6c60ca44f56203eeda9fc0e07b508f06
+refs/heads/master: 15f2f9b3a9db65aaf908fe7ee17bbe262ae3550f
diff --git a/trunk/drivers/base/firmware.c b/trunk/drivers/base/firmware.c
index c7f635b11dfd..9efff481f5dc 100644
--- a/trunk/drivers/base/firmware.c
+++ b/trunk/drivers/base/firmware.c
@@ -3,11 +3,11 @@
  *
  * Copyright (c) 2002-3 Patrick Mochel
  * Copyright (c) 2002-3 Open Source Development Labs
+ * 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/module.h>
 #include <linux/init.h>
@@ -18,18 +18,6 @@
 struct kset *firmware_kset;
 EXPORT_SYMBOL_GPL(firmware_kset);
 
-int firmware_register(struct kset *s)
-{
-	s->kobj.kset = firmware_kset;
-	s->kobj.ktype = NULL;
-	return subsystem_register(s);
-}
-
-void firmware_unregister(struct kset *s)
-{
-	subsystem_unregister(s);
-}
-
 int __init firmware_init(void)
 {
 	firmware_kset = kset_create_and_add("firmware", NULL, NULL);
@@ -37,6 +25,3 @@ int __init firmware_init(void)
 		return -ENOMEM;
 	return 0;
 }
-
-EXPORT_SYMBOL_GPL(firmware_register);
-EXPORT_SYMBOL_GPL(firmware_unregister);
diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h
index 110ace0dec3f..a3b3ff15fc87 100644
--- a/trunk/include/linux/device.h
+++ b/trunk/include/linux/device.h
@@ -555,11 +555,6 @@ extern void device_shutdown(void);
 /* drivers/base/sys.c */
 extern void sysdev_shutdown(void);
 
-
-/* drivers/base/firmware.c */
-extern int __must_check firmware_register(struct kset *);
-extern void firmware_unregister(struct kset *);
-
 /* debugging and troubleshooting/diagnostic helpers. */
 extern const char *dev_driver_string(struct device *dev);
 #define dev_printk(level, dev, format, arg...)	\