diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
| commit | 919251758195919ae3568021bc221e4f8c4b20eb (patch) | |
| tree | 81137a037ff8e6c91cc8de72d568275605c653c5 /drivers/char/hvc_rtas.c | |
| parent | c394f1eafef61c6666f5876afde6110a276c4c9f (diff) | |
| parent | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a (diff) | |
Merge branch 'mainline' into upstream-linus
Diffstat (limited to 'drivers/char/hvc_rtas.c')
| -rw-r--r-- | drivers/char/hvc_rtas.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hvc_rtas.c b/drivers/char/hvc_rtas.c index 57106e02fd2e..4b97eaf18602 100644 --- a/drivers/char/hvc_rtas.c +++ b/drivers/char/hvc_rtas.c | |||
| @@ -94,7 +94,7 @@ static int hvc_rtas_init(void) | |||
| 94 | 94 | ||
| 95 | /* Allocate an hvc_struct for the console device we instantiated | 95 | /* Allocate an hvc_struct for the console device we instantiated |
| 96 | * earlier. Save off hp so that we can return it on exit */ | 96 | * earlier. Save off hp so that we can return it on exit */ |
| 97 | hp = hvc_alloc(hvc_rtas_cookie, NO_IRQ, &hvc_rtas_get_put_ops); | 97 | hp = hvc_alloc(hvc_rtas_cookie, NO_IRQ, &hvc_rtas_get_put_ops, 16); |
| 98 | if (IS_ERR(hp)) | 98 | if (IS_ERR(hp)) |
| 99 | return PTR_ERR(hp); | 99 | return PTR_ERR(hp); |
| 100 | 100 | ||