From 51c2b600decfc58b4b3b213901b807ac6f45d1fb Mon Sep 17 00:00:00 2001
From: Russell King <rmk@arm.linux.org.uk>
Date: Thu, 5 Jan 2006 14:43:11 +0000
Subject: [PATCH] --- yaml --- r: 18395 b: refs/heads/master c:
 ac33bc3d54936d364c1f979e50f43dfa3f9a13c1 h: refs/heads/master i:   18393:
 a1d369b49eda3a5cfde41ac58a6baf5f35c4a1f2   18391:
 e283b7286ac0ee8eadac3f137dcd7e157826f72c v: v3

---
 [refs]                         |  2 +-
 trunk/drivers/usb/serial/bus.c | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 7c4e45bc20b0..43c84bb4246e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff2dae79773658eaaab731663ddca9f7975430eb
+refs/heads/master: ac33bc3d54936d364c1f979e50f43dfa3f9a13c1
diff --git a/trunk/drivers/usb/serial/bus.c b/trunk/drivers/usb/serial/bus.c
index 664139afcfa9..e9f9f4bafa17 100644
--- a/trunk/drivers/usb/serial/bus.c
+++ b/trunk/drivers/usb/serial/bus.c
@@ -37,11 +37,6 @@ static int usb_serial_device_match (struct device *dev, struct device_driver *dr
 	return 0;
 }
 
-struct bus_type usb_serial_bus_type = {
-	.name =		"usb-serial",
-	.match =	usb_serial_device_match,
-};
-
 static int usb_serial_device_probe (struct device *dev)
 {
 	struct usb_serial_driver *driver;
@@ -109,14 +104,18 @@ static int usb_serial_device_remove (struct device *dev)
 	return retval;
 }
 
+struct bus_type usb_serial_bus_type = {
+	.name =		"usb-serial",
+	.match =	usb_serial_device_match,
+	.probe =	usb_serial_device_probe,
+	.remove =	usb_serial_device_remove,
+};
+
 int usb_serial_bus_register(struct usb_serial_driver *driver)
 {
 	int retval;
 
 	driver->driver.bus = &usb_serial_bus_type;
-	driver->driver.probe = usb_serial_device_probe;
-	driver->driver.remove = usb_serial_device_remove;
-
 	retval = driver_register(&driver->driver);
 
 	return retval;