diff options
7 files changed, 8 insertions, 8 deletions
diff --git a/driver-core.current/device-create-char-convert-device_create_drvdata-to-device_create.patch b/driver-core.current/device-create-char-convert-device_create_drvdata-to-device_create.patch index 80200a621e7182..94d83e73a14f97 100644 --- a/driver-core.current/device-create-char-convert-device_create_drvdata-to-device_create.patch +++ b/driver-core.current/device-create-char-convert-device_create_drvdata-to-device_create.patch @@ -325,7 +325,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> i, viotape_unitinfo[i].rsrcname, --- a/drivers/char/vt.c +++ b/drivers/char/vt.c -@@ -3425,10 +3425,9 @@ int register_con_driver(const struct con +@@ -3423,10 +3423,9 @@ int register_con_driver(const struct con if (retval) goto err; @@ -339,7 +339,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (IS_ERR(con_driver->dev)) { printk(KERN_WARNING "Unable to create device for %s; " -@@ -3536,10 +3535,9 @@ static int __init vtconsole_class_init(v +@@ -3534,10 +3533,9 @@ static int __init vtconsole_class_init(v struct con_driver *con = ®istered_con_driver[i]; if (con->con && !con->dev) { diff --git a/driver-core.current/device-create-ide-convert-device_create_drvdata-to-device_create.patch b/driver-core.current/device-create-ide-convert-device_create_drvdata-to-device_create.patch index a7933ed8400da6..41b69a0759a5e6 100644 --- a/driver-core.current/device-create-ide-convert-device_create_drvdata-to-device_create.patch +++ b/driver-core.current/device-create-ide-convert-device_create_drvdata-to-device_create.patch @@ -32,7 +32,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> device_unregister(&hwif->gendev); --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c -@@ -2686,12 +2686,11 @@ static int ide_tape_probe(ide_drive_t *d +@@ -2687,12 +2687,11 @@ static int ide_tape_probe(ide_drive_t *d idetape_setup(drive, tape, minor); diff --git a/driver-core.current/device-create-video-convert-device_create_drvdata-to-device_create.patch b/driver-core.current/device-create-video-convert-device_create_drvdata-to-device_create.patch index 986c206c9b9968..3a04a4f65abda5 100644 --- a/driver-core.current/device-create-video-convert-device_create_drvdata-to-device_create.patch +++ b/driver-core.current/device-create-video-convert-device_create_drvdata-to-device_create.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c -@@ -3585,8 +3585,8 @@ static int __init fb_console_init(void) +@@ -3588,8 +3588,8 @@ static int __init fb_console_init(void) acquire_console_sem(); fb_register_client(&fbcon_event_notifier); diff --git a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch index 89985d87bdfe50..67bee3bb228a66 100644 --- a/driver-core/warn-when-statically-allocated-kobjects-are-used.patch +++ b/driver-core/warn-when-statically-allocated-kobjects-are-used.patch @@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> void setup_arch(char **); --- a/init/main.c +++ b/init/main.c -@@ -789,12 +789,21 @@ static void run_init_process(char *init_ +@@ -788,12 +788,21 @@ static void run_init_process(char *init_ kernel_execve(init_filename, argv_init, envp_init); } diff --git a/usb.current/usb-add-musb-and-tusb-support.patch b/usb.current/usb-add-musb-and-tusb-support.patch index 066243df279eb6..79229ee4546be0 100644 --- a/usb.current/usb-add-musb-and-tusb-support.patch +++ b/usb.current/usb-add-musb-and-tusb-support.patch @@ -15915,7 +15915,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +#endif /* OMAP2 */ --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2908,6 +2908,12 @@ M: jirislaby@gmail.com +@@ -2914,6 +2914,12 @@ M: jirislaby@gmail.com L: linux-kernel@vger.kernel.org S: Maintained diff --git a/usb.current/usb-auerswald-remove-driver.patch b/usb.current/usb-auerswald-remove-driver.patch index 263540d2c1d37c..63db4f1b1395b9 100644 --- a/usb.current/usb-auerswald-remove-driver.patch +++ b/usb.current/usb-auerswald-remove-driver.patch @@ -2278,7 +2278,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> obj-$(CONFIG_USB_CYTHERM) += cytherm.o --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -4175,12 +4175,6 @@ M: oliver@neukum.name +@@ -4181,12 +4181,6 @@ M: oliver@neukum.name L: linux-usb@vger.kernel.org S: Maintained @@ -1 +1 @@ -2.6.27-rc1-git4 +2.6.27-rc2 |