From: Len Brown <len.brown@intel.com>
Date: Fri, 9 Jan 2009 08:37:48 +0000 (-0500)
Subject: Merge branch 'misc' into release
X-Git-Tag: v2.6.29-rc1~34^2~4
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=d0302bc62af7983040ea1cd1b5dd2b36e1a6a509;p=linux-2.6-omap-h63xx.git

Merge branch 'misc' into release

Conflicts:
	include/acpi/acpixf.h

Signed-off-by: Len Brown <len.brown@intel.com>
---

d0302bc62af7983040ea1cd1b5dd2b36e1a6a509
diff --cc include/acpi/acpixf.h
index 7c7074f2008,05d2614e007..c8e8cf45830
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@@ -52,24 -48,7 +52,25 @@@
  #include "actypes.h"
  #include "actbl.h"
  
 +extern u8 acpi_gbl_permanent_mmap;
 +
 +/*
 + * Globals that are publically available, allowing for
 + * run time configuration
 + */
 +extern u32 acpi_dbg_level;
 +extern u32 acpi_dbg_layer;
 +extern u8 acpi_gbl_enable_interpreter_slack;
 +extern u8 acpi_gbl_all_methods_serialized;
 +extern u8 acpi_gbl_create_osi_method;
 +extern u8 acpi_gbl_leave_wake_gpes_disabled;
 +extern acpi_name acpi_gbl_trace_method_name;
 +extern u32 acpi_gbl_trace_flags;
 +
 +extern u32 acpi_current_gpe_count;
 +extern struct acpi_table_fadt acpi_gbl_FADT;
 +
+ extern u32 acpi_rsdt_forced;
  /*
   * Global interfaces
   */