aboutsummaryrefslogtreecommitdiffstats
path: root/pending
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2007-11-21 16:49:52 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2007-11-21 16:49:52 -0800
commitedf85d419936544e4602abc39886378c30061f1d (patch)
tree8a9f5b1a6c720db5bb0f6479dc55af7d4f81f80b /pending
parent71678268cd21ccde999cbe107ed13432a66d695b (diff)
downloadpatches-edf85d419936544e4602abc39886378c30061f1d.tar.gz
pci and usb patches added
Diffstat (limited to 'pending')
-rw-r--r--pending/mm1.patch17
-rw-r--r--pending/mm2.patch15
2 files changed, 32 insertions, 0 deletions
diff --git a/pending/mm1.patch b/pending/mm1.patch
new file mode 100644
index 00000000000000..91ccc32caecfa1
--- /dev/null
+++ b/pending/mm1.patch
@@ -0,0 +1,17 @@
+---
+ block/genhd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/block/genhd.c
++++ b/block/genhd.c
+@@ -718,9 +718,9 @@ struct gendisk *alloc_disk_node(int mino
+ }
+ }
+ disk->minors = minors;
+- kobject_init(&disk->kobj);
+ disk->kobj.kset = block_kset;
+ disk->kobj.ktype = &ktype_block;
++ kobject_init(&disk->kobj);
+ rand_initialize_disk(disk);
+ INIT_WORK(&disk->async_notify,
+ media_change_notify_thread);
diff --git a/pending/mm2.patch b/pending/mm2.patch
new file mode 100644
index 00000000000000..47ffeda23deb6c
--- /dev/null
+++ b/pending/mm2.patch
@@ -0,0 +1,15 @@
+---
+ drivers/base/sys.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/base/sys.c
++++ b/drivers/base/sys.c
+@@ -451,7 +451,7 @@ int sysdev_resume(void)
+ int __init system_bus_init(void)
+ {
+ system_kset = kset_create_and_register("system", NULL,
+- NULL, devices_kset);
++ &devices_kset->kobj, NULL);
+ if (!system_kset)
+ return -ENOMEM;
+ return 0;