Merge branch 'misc' into release
authorLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:37:48 +0000 (03:37 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 9 Jan 2009 08:37:48 +0000 (03:37 -0500)
Conflicts:
include/acpi/acpixf.h

Signed-off-by: Len Brown <len.brown@intel.com>
1  2 
arch/x86/kernel/acpi/boot.c
drivers/acpi/acpica/tbutils.c
drivers/acpi/pci_link.c
drivers/acpi/video.c
include/acpi/acpixf.h

Simple merge
Simple merge
Simple merge
Simple merge
  #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
   */