aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/hvc_console.h
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2006-07-13 05:05:50 -0400
committerStephen Rothwell <sfr@canb.auug.org.au>2006-07-13 05:05:50 -0400
commit20697cb775bdd0271f3c90fad2d15c065fd19488 (patch)
tree011ae1040fda8cf4a4bf660a523d7e9abf682597 /drivers/char/hvc_console.h
parent54f5cd8afa1c9c9f8b152a946b0a7e0ecdef1631 (diff)
parent4e9e95a3554e98e7383a3591283ffcd850c9ef48 (diff)
Merge branch 'hvc_iseries'
Diffstat (limited to 'drivers/char/hvc_console.h')
-rw-r--r--drivers/char/hvc_console.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hvc_console.h b/drivers/char/hvc_console.h
index 96b7401319c1..8c59818050e6 100644
--- a/drivers/char/hvc_console.h
+++ b/drivers/char/hvc_console.h
@@ -56,7 +56,7 @@ extern int hvc_instantiate(uint32_t vtermno, int index, struct hv_ops *ops);
56 56
57/* register a vterm for hvc tty operation (module_init or hotplug add) */ 57/* register a vterm for hvc tty operation (module_init or hotplug add) */
58extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int irq, 58extern struct hvc_struct * __devinit hvc_alloc(uint32_t vtermno, int irq,
59 struct hv_ops *ops); 59 struct hv_ops *ops, int outbuf_size);
60/* remove a vterm from hvc tty operation (modele_exit or hotplug remove) */ 60/* remove a vterm from hvc tty operation (modele_exit or hotplug remove) */
61extern int __devexit hvc_remove(struct hvc_struct *hp); 61extern int __devexit hvc_remove(struct hvc_struct *hp);
62 62