diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-09-29 16:14:29 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-09-29 16:14:29 -0700 |
| commit | 8f751301af2997f38e072088f83719f8c85c8164 (patch) | |
| tree | 415e34122af220caf75570b535d6042dbb65be20 | |
| parent | a91b085f9dbbc550c03c97e4978626bf6baae47a (diff) | |
| download | patches-8f751301af2997f38e072088f83719f8c85c8164.tar.gz | |
2.6.27-rc8 resync
| -rw-r--r-- | driver-core/device-create-char-convert-device_create_drvdata-to-device_create.patch | 6 | ||||
| -rw-r--r-- | version | 2 |
2 files changed, 4 insertions, 4 deletions
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 4dc454106c07f3..4bc4dc40833ba1 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 -@@ -3408,7 +3408,7 @@ struct device *tty_register_device(struc +@@ -3418,7 +3418,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> } /** -@@ -3685,22 +3685,20 @@ static int __init tty_init(void) +@@ -3695,22 +3695,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 -@@ -3708,7 +3706,7 @@ static int __init tty_init(void) +@@ -3718,7 +3716,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"); @@ -1 +1 @@ -2.6.27-rc7-git3 +2.6.27-rc8 |