Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/char/hvc_iseries.c b/drivers/char/hvc_iseries.c
index 936d05bf37fa..21c54955084e 100644
--- a/drivers/char/hvc_iseries.c
+++ b/drivers/char/hvc_iseries.c
@@ -197,7 +197,7 @@ done:
         return sent;
 }
 
-static struct hv_ops hvc_get_put_ops = {
+static const struct hv_ops hvc_get_put_ops = {
         .get_chars = get_chars,
         .put_chars = put_chars,
         .notifier_add = notifier_add_irq,
@@ -353,7 +353,7 @@ static void hvc_close_event(struct HvLpEvent *event)
 
         if (!hvlpevent_is_int(event)) {
                 printk(KERN_WARNING
-                        "hvc: got unexpected close acknowlegement\n");
+                        "hvc: got unexpected close acknowledgement\n");
                 return;
         }