From 870e0fd5febdb9dda0bccbed07aed5ed4ee510a7 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Wed, 12 Sep 2007 15:06:57 -0700
Subject: [PATCH] --- yaml --- r: 67946 b: refs/heads/master c:
 7e7654a92a5a75a350cc3458389bc76273498f6a h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/block/bsg.c                         | 5 +----
 trunk/drivers/char/raw.c                  | 5 +----
 trunk/drivers/media/dvb/dvb-core/dvbdev.c | 5 +----
 trunk/drivers/usb/core/devio.c            | 6 ++----
 5 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index c2b38ddcfb99..f2356fc0a914 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19c38de88a80913351fcacefdb461cc0b585fa87
+refs/heads/master: 7e7654a92a5a75a350cc3458389bc76273498f6a
diff --git a/trunk/block/bsg.c b/trunk/block/bsg.c
index ed2646827234..b8ddfc66f210 100644
--- a/trunk/block/bsg.c
+++ b/trunk/block/bsg.c
@@ -1010,10 +1010,7 @@ int bsg_register_queue(struct request_queue *q, struct device *gdev,
 }
 EXPORT_SYMBOL_GPL(bsg_register_queue);
 
-static struct cdev bsg_cdev = {
-	.kobj   = {.name = "bsg", },
-	.owner  = THIS_MODULE,
-};
+static struct cdev bsg_cdev;
 
 static int __init bsg_init(void)
 {
diff --git a/trunk/drivers/char/raw.c b/trunk/drivers/char/raw.c
index 1f0d7c60c944..bbfa0e241cba 100644
--- a/trunk/drivers/char/raw.c
+++ b/trunk/drivers/char/raw.c
@@ -255,10 +255,7 @@ static const struct file_operations raw_ctl_fops = {
 	.owner	=	THIS_MODULE,
 };
 
-static struct cdev raw_cdev = {
-	.kobj	=	{.name = "raw", },
-	.owner	=	THIS_MODULE,
-};
+static struct cdev raw_cdev;
 
 static int __init raw_init(void)
 {
diff --git a/trunk/drivers/media/dvb/dvb-core/dvbdev.c b/trunk/drivers/media/dvb/dvb-core/dvbdev.c
index 56231d8edc07..18738faecbbc 100644
--- a/trunk/drivers/media/dvb/dvb-core/dvbdev.c
+++ b/trunk/drivers/media/dvb/dvb-core/dvbdev.c
@@ -103,10 +103,7 @@ static struct file_operations dvb_device_fops =
 	.open =		dvb_device_open,
 };
 
-static struct cdev dvb_device_cdev = {
-	.kobj   = {.name = "dvb", },
-	.owner  =       THIS_MODULE,
-};
+static struct cdev dvb_device_cdev;
 
 int dvb_generic_open(struct inode *inode, struct file *file)
 {
diff --git a/trunk/drivers/usb/core/devio.c b/trunk/drivers/usb/core/devio.c
index 927a181120a9..fe98796d2ff1 100644
--- a/trunk/drivers/usb/core/devio.c
+++ b/trunk/drivers/usb/core/devio.c
@@ -1576,6 +1576,7 @@ static unsigned int usbdev_poll(struct file *file, struct poll_table_struct *wai
 }
 
 const struct file_operations usbdev_file_operations = {
+	.owner = 	THIS_MODULE,
 	.llseek =	usbdev_lseek,
 	.read =		usbdev_read,
 	.poll =		usbdev_poll,
@@ -1625,10 +1626,7 @@ static struct notifier_block usbdev_nb = {
 };
 #endif
 
-static struct cdev usb_device_cdev = {
-	.kobj   = {.name = "usb_device", },
-	.owner  = THIS_MODULE,
-};
+static struct cdev usb_device_cdev;
 
 int __init usb_devio_init(void)
 {