Re: [PATCH 2.6.26-rc5 1/2] cris: compile fixes for 2.6.26-rc5

["Hinko Koc(evar" <hinko.kocevar@cetrtapot.si>]

[-- Attachment #1: Type: text/plain, Size: 170 bytes --]

Stab 2

Add dummy ops for serial debug port.
Add setting of c_ispeed/c_ospeed as suggested by Alan Cox.

Signed-off-by: Hinko Kocevar <hinko.kocevar@cetrtapot.si>

---



[-- Attachment #2: 001-cris-debugport-add-dummy-ops.patch --]
[-- Type: text/x-patch, Size: 1102 bytes --]

diff --git a/arch/cris/arch-v10/kernel/debugport.c b/arch/cris/arch-v10/kernel/debugport.c
index 04d5eee..36eee3d 100644
--- a/arch/cris/arch-v10/kernel/debugport.c
+++ b/arch/cris/arch-v10/kernel/debugport.c
@@ -432,6 +432,13 @@ dummy_write_room(struct tty_struct *tty)
 	return 8192;
 }
 
+static struct tty_operations dummy_ops = {
+	.open = &dummy_open,
+	.close = &dummy_close,
+	.write = &dummy_write,
+	.write_room = &dummy_write_room,
+};
+
 void __init
 init_dummy_console(void)
 {
@@ -447,11 +454,10 @@ init_dummy_console(void)
 	dummy_driver.init_termios.c_cflag =
 		B115200 | CS8 | CREAD | HUPCL | CLOCAL; /* is normally B9600 default... */
 	dummy_driver.flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
+	dummy_driver.init_termios.c_ispeed = 115200;
+	dummy_driver.init_termios.c_ospeed = 115200;
 
-	dummy_driver.open = dummy_open;
-	dummy_driver.close = dummy_close;
-	dummy_driver.write = dummy_write;
-	dummy_driver.write_room = dummy_write_room;
+	dummy_driver.ops = &dummy_ops;
 	if (tty_register_driver(&dummy_driver))
 		panic("Couldn't register dummy serial driver\n");
 }