aboutsummaryrefslogtreecommitdiffstats
diff options
-rw-r--r--driver-core/driver-core-bsg-add-nodename-for-bsg-driver.patch4
-rw-r--r--version2
2 files changed, 3 insertions, 3 deletions
diff --git a/driver-core/driver-core-bsg-add-nodename-for-bsg-driver.patch b/driver-core/driver-core-bsg-add-nodename-for-bsg-driver.patch
index a4933ef03fc633..4057e85979bff7 100644
--- a/driver-core/driver-core-bsg-add-nodename-for-bsg-driver.patch
+++ b/driver-core/driver-core-bsg-add-nodename-for-bsg-driver.patch
@@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/block/bsg.c
+++ b/block/bsg.c
-@@ -1062,6 +1062,11 @@ EXPORT_SYMBOL_GPL(bsg_register_queue);
+@@ -1065,6 +1065,11 @@ EXPORT_SYMBOL_GPL(bsg_register_queue);
static struct cdev bsg_cdev;
@@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
static int __init bsg_init(void)
{
int ret, i;
-@@ -1082,6 +1087,7 @@ static int __init bsg_init(void)
+@@ -1085,6 +1090,7 @@ static int __init bsg_init(void)
ret = PTR_ERR(bsg_class);
goto destroy_kmemcache;
}
diff --git a/version b/version
index 05f914e9337c68..cb7a35cabde906 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.30-rc8
+2.6.30