Merge branch 'master'; commit 'v2.6.39-rc3' into next

2 files changed, 7 insertions, 9 deletions

diff --git a/drivers/xen/events.c b/drivers/xen/events.c
index 036343ba204e..33167b43ac7e 100644
--- a/drivers/xen/events.c
+++ b/drivers/xen/events.c
@@ -5,7 +5,7 @@
  * domain gets 1024 event channels, but NR_IRQ is not that large, we
  * must dynamically map irqs<->event channels.  The event channels
  * interface with the rest of the kernel by defining a xen interrupt
- * chip.  When an event is recieved, it is mapped to an irq and sent
+ * chip.  When an event is received, it is mapped to an irq and sent
  * through the normal interrupt processing path.
  *
  * There are four kinds of events which can be mapped to an event
@@ -416,7 +416,7 @@ static int __must_check xen_allocate_irq_dynamic(void)
 #ifdef CONFIG_X86_IO_APIC
         /*
          * For an HVM guest or domain 0 which see "real" (emulated or
-         * actual repectively) GSIs we allocate dynamic IRQs
+         * actual respectively) GSIs we allocate dynamic IRQs
          * e.g. those corresponding to event channels or MSIs
          * etc. from the range above those "real" GSIs to avoid
          * collisions.
@@ -912,8 +912,7 @@ int bind_evtchn_to_irqhandler(unsigned int evtchn,
                               unsigned long irqflags,
                               const char *devname, void *dev_id)
 {
-        unsigned int irq;
-        int retval;
+        int irq, retval;
 
         irq = bind_evtchn_to_irq(evtchn);
         if (irq < 0)
@@ -955,8 +954,7 @@ int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
                             irq_handler_t handler,
                             unsigned long irqflags, const char *devname, void *dev_id)
 {
-        unsigned int irq;
-        int retval;
+        int irq, retval;
 
         irq = bind_virq_to_irq(virq, cpu);
         if (irq < 0)
diff --git a/drivers/xen/manage.c b/drivers/xen/manage.c
index 95143dd6904d..1ac94125bf93 100644
--- a/drivers/xen/manage.c
+++ b/drivers/xen/manage.c
@@ -61,7 +61,7 @@ static void xen_post_suspend(int cancelled)
         xen_mm_unpin_all();
 }
 
-#ifdef CONFIG_HIBERNATION
+#ifdef CONFIG_HIBERNATE_CALLBACKS
 static int xen_suspend(void *data)
 {
         struct suspend_info *si = data;
@@ -173,7 +173,7 @@ out:
 #endif
         shutting_down = SHUTDOWN_INVALID;
 }
-#endif  /* CONFIG_HIBERNATION */
+#endif  /* CONFIG_HIBERNATE_CALLBACKS */
 
 struct shutdown_handler {
         const char *command;
@@ -202,7 +202,7 @@ static void shutdown_handler(struct xenbus_watch *watch,
                 { "poweroff",   do_poweroff },
                 { "halt",       do_poweroff },
                 { "reboot",     do_reboot   },
-#ifdef CONFIG_HIBERNATION
+#ifdef CONFIG_HIBERNATE_CALLBACKS
                 { "suspend",    do_suspend  },
 #endif
                 {NULL, NULL},