Merge branch 'master' into tk71

[mv-sheeva.git] / drivers / tty / hvc / hvc_tile.c

diff --git a/drivers/char/hvc_tile.c b/drivers/tty/hvc/hvc_tile.c
similarity index 93%
rename from drivers/char/hvc_tile.c
rename to drivers/tty/hvc/hvc_tile.c
index c4efb55cbc03d380fded78b6e5bc61e63406cbcb..7a84a0595477512581b4247f8a0165d775d34aba 100644 (file)
--- a/drivers/char/hvc_tile.c
+++ b/drivers/tty/hvc/hvc_tile.c
@@ -61,7 +61,8 @@ console_initcall(hvc_tile_console_init);
 
 static int __init hvc_tile_init(void)
 {
-       hvc_alloc(0, 0, &hvc_tile_get_put_ops, 128);
-       return 0;
+       struct hvc_struct *s;
+       s = hvc_alloc(0, 0, &hvc_tile_get_put_ops, 128);
+       return IS_ERR(s) ? PTR_ERR(s) : 0;
 }
 device_initcall(hvc_tile_init);