diff options
6 files changed, 9 insertions, 11 deletions
diff --git a/driver-core/device-create-block-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-block-convert-device_create_drvdata-to-device_create.patch index d4d7bef4a43dc8..278299460d2dd2 100644 --- a/driver-core/device-create-block-convert-device_create_drvdata-to-device_create.patch +++ b/driver-core/device-create-block-convert-device_create_drvdata-to-device_create.patch @@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/block/bsg.c +++ b/block/bsg.c -@@ -1044,8 +1044,7 @@ int bsg_register_queue(struct request_qu +@@ -1022,8 +1022,7 @@ int bsg_register_queue(struct request_qu bcd->release = release; kref_init(&bcd->ref); dev = MKDEV(bsg_major, bcd->minor); @@ -80,7 +80,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c -@@ -303,9 +303,8 @@ static struct kobj_type kobj_pkt_type_wq +@@ -302,9 +302,8 @@ static struct kobj_type kobj_pkt_type_wq static void pkt_sysfs_dev_new(struct pktcdvd_device *pd) { if (class_pktcdvd) { diff --git a/driver-core/device-create-char-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-char-convert-device_create_drvdata-to-device_create.patch index 6b8f32c9be685e..4dc454106c07f3 100644 --- a/driver-core/device-create-char-convert-device_create_drvdata-to-device_create.patch +++ b/driver-core/device-create-char-convert-device_create_drvdata-to-device_create.patch @@ -235,7 +235,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> err_unrtty: --- a/drivers/char/tty_io.c +++ b/drivers/char/tty_io.c -@@ -3407,7 +3407,7 @@ struct device *tty_register_device(struc +@@ -3408,7 +3408,7 @@ struct device *tty_register_device(struc else tty_line_name(driver, index, name); @@ -244,7 +244,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } /** -@@ -3684,22 +3684,20 @@ static int __init tty_init(void) +@@ -3685,22 +3685,20 @@ static int __init tty_init(void) if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) || register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0) panic("Couldn't register /dev/tty driver\n"); @@ -270,7 +270,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif #ifdef CONFIG_VT -@@ -3707,7 +3705,7 @@ static int __init tty_init(void) +@@ -3708,7 +3706,7 @@ static int __init tty_init(void) if (cdev_add(&vc0_cdev, MKDEV(TTY_MAJOR, 0), 1) || register_chrdev_region(MKDEV(TTY_MAJOR, 0), 1, "/dev/vc/0") < 0) panic("Couldn't register /dev/tty0 driver\n"); diff --git a/driver-core/device-create-misc-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-misc-convert-device_create_drvdata-to-device_create.patch index 84a2f892beb4a3..dfbdc15127e349 100644 --- a/driver-core/device-create-misc-convert-device_create_drvdata-to-device_create.patch +++ b/driver-core/device-create-misc-convert-device_create_drvdata-to-device_create.patch @@ -59,7 +59,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto out_class; --- a/arch/x86/kernel/cpuid.c +++ b/arch/x86/kernel/cpuid.c -@@ -141,8 +141,8 @@ static __cpuinit int cpuid_device_create +@@ -148,8 +148,8 @@ static __cpuinit int cpuid_device_create { struct device *dev; @@ -72,7 +72,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/arch/x86/kernel/msr.c +++ b/arch/x86/kernel/msr.c -@@ -149,8 +149,8 @@ static int __cpuinit msr_device_create(i +@@ -163,8 +163,8 @@ static int __cpuinit msr_device_create(i { struct device *dev; diff --git a/driver-core/device-create-scsi-convert-device_create_drvdata-to-device_create.patch b/driver-core/device-create-scsi-convert-device_create_drvdata-to-device_create.patch index 45bbc2e4c6a857..f4d3718bc9d781 100644 --- a/driver-core/device-create-scsi-convert-device_create_drvdata-to-device_create.patch +++ b/driver-core/device-create-scsi-convert-device_create_drvdata-to-device_create.patch @@ -60,7 +60,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return PTR_ERR(osst_member); --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c -@@ -1454,12 +1454,10 @@ sg_add(struct device *cl_dev, struct cla +@@ -1467,12 +1467,10 @@ sg_add(struct device *cl_dev, struct cla if (sg_sysfs_valid) { struct device *sg_class_member; @@ -130,8 +130,6 @@ usb/fsl_usb2_udc-add-a-wmb-before-priming-endpoint.patch usb/fsl_usb2_udc-fix-oops-on-probe-failure.patch # HSO - goes through jeff -usb/hso-icon-322-detection-fix.patch -usb/hso-dev_kfree_skb-crash-fix.patch usb/hso-fix-hso_serial_close-refcounting.patch usb/hso-put-linefeeds-on-printk-s-in-hso.c.patch @@ -1 +1 @@ -2.6.27-rc4-git6 +2.6.27-rc5 |