Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  acpi,msi-laptop: Fall back to EC polling mode for MSI laptop specific EC commands
  sony-laptop: rename SONY_LAPTOP_OLD to a more meaningful SONYPI_COMPAT
  asus-laptop: version bump and lindent
  asus-laptop: fix light sens init
  asus-laptop: add GPS support
  asus-laptop: notify ALL events
  ACPICA: Lindent
  ACPI: created a dedicated workqueue for notify() execution
  Revert "ACPICA: fix AML mutex re-entrancy"
  Revert "Execute AML Notify() requests on stack."
  Revert "ACPICA: revert "acpi_serialize" changes"
  ACPI: delete un-reliable concept of cooling mode
  ACPI: thermal trip points are read-only

1 files changed, 5 insertions, 6 deletions

diff --git a/drivers/acpi/sleep/proc.c b/drivers/acpi/sleep/proc.c
index 76b45f0b8341..61f1822cc350 100644
--- a/drivers/acpi/sleep/proc.c
+++ b/drivers/acpi/sleep/proc.c
@@ -349,8 +349,7 @@ acpi_system_write_alarm(struct file *file,
       end:
         return_VALUE(result ? result : count);
 }
-#endif  /* HAVE_ACPI_LEGACY_ALARM */
-
+#endif                          /* HAVE_ACPI_LEGACY_ALARM */
 
 extern struct list_head acpi_wakeup_device_list;
 extern spinlock_t acpi_device_lock;
@@ -380,8 +379,8 @@ acpi_system_wakeup_device_seq_show(struct seq_file *seq, void *offset)
                            dev->wakeup.state.enabled ? "enabled" : "disabled");
                 if (ldev)
                         seq_printf(seq, "%s:%s",
-                                ldev->bus ? ldev->bus->name : "no-bus",
-                                ldev->bus_id);
+                                   ldev->bus ? ldev->bus->name : "no-bus",
+                                   ldev->bus_id);
                 seq_printf(seq, "\n");
                 put_device(ldev);
 
@@ -490,7 +489,7 @@ static u32 rtc_handler(void *context)
 
         return ACPI_INTERRUPT_HANDLED;
 }
-#endif  /* HAVE_ACPI_LEGACY_ALARM */
+#endif                          /* HAVE_ACPI_LEGACY_ALARM */
 
 static int __init acpi_sleep_proc_init(void)
 {
@@ -517,7 +516,7 @@ static int __init acpi_sleep_proc_init(void)
                 entry->proc_fops = &acpi_system_alarm_fops;
 
         acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, NULL);
-#endif  /* HAVE_ACPI_LEGACY_ALARM */
+#endif                          /* HAVE_ACPI_LEGACY_ALARM */
 
         /* 'wakeup device' [R/W] */
         entry =