From c28cdd2354edd75da6f57ac728e1421f35fd53be Mon Sep 17 00:00:00 2001 From: Sebastian Ott Date: Wed, 23 Mar 2011 10:16:03 +0100 Subject: [PATCH] --- yaml --- r: 242491 b: refs/heads/master c: d5ab5276baf9fd8b581cfbf41b10b6d4eae55960 h: refs/heads/master i: 242489: 4ad42e4b114be4554f0d148f26541501442519c8 242487: 6e053b7686ad33c58bc03853b67cd6372ad0de0e v: v3 --- [refs] | 2 +- trunk/drivers/s390/cio/device.c | 5 ++--- trunk/drivers/s390/cio/device.h | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 5b151e55125b..7ff3d1c5bf99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3bda058b0c39fc72188116d2fd71af08dd0fe5b0 +refs/heads/master: d5ab5276baf9fd8b581cfbf41b10b6d4eae55960 diff --git a/trunk/drivers/s390/cio/device.c b/trunk/drivers/s390/cio/device.c index 334459eb23c8..df14c51f6532 100644 --- a/trunk/drivers/s390/cio/device.c +++ b/trunk/drivers/s390/cio/device.c @@ -127,7 +127,7 @@ static int ccw_uevent(struct device *dev, struct kobj_uevent_env *env) return ret; } -struct bus_type ccw_bus_type; +static struct bus_type ccw_bus_type; static void io_subchannel_irq(struct subchannel *); static int io_subchannel_probe(struct subchannel *); @@ -1970,7 +1970,7 @@ static const struct dev_pm_ops ccw_pm_ops = { .restore = ccw_device_pm_restore, }; -struct bus_type ccw_bus_type = { +static struct bus_type ccw_bus_type = { .name = "ccw", .match = ccw_bus_match, .uevent = ccw_uevent, @@ -2110,5 +2110,4 @@ EXPORT_SYMBOL(ccw_device_set_offline); EXPORT_SYMBOL(ccw_driver_register); EXPORT_SYMBOL(ccw_driver_unregister); EXPORT_SYMBOL(get_ccwdev_by_busid); -EXPORT_SYMBOL(ccw_bus_type); EXPORT_SYMBOL_GPL(ccw_device_get_subchannel_id); diff --git a/trunk/drivers/s390/cio/device.h b/trunk/drivers/s390/cio/device.h index 379de2d1ec49..7e297c7bb5ff 100644 --- a/trunk/drivers/s390/cio/device.h +++ b/trunk/drivers/s390/cio/device.h @@ -133,7 +133,6 @@ void ccw_device_set_notoper(struct ccw_device *cdev); /* qdio needs this. */ void ccw_device_set_timeout(struct ccw_device *, int); extern struct subchannel_id ccw_device_get_subchannel_id(struct ccw_device *); -extern struct bus_type ccw_bus_type; /* Channel measurement facility related */ void retry_set_schib(struct ccw_device *cdev);