diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-18 13:49:29 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-18 13:49:29 +0100 |
| commit | a090b22f3fafa9340f903834de87552b50c5f2ba (patch) | |
| tree | d07b55c9d60d585f8ceed2c8f43e8a04309fc67e /arch/x86 | |
| parent | 0b3571274b8ff53c0e08bc667ecd3d8a43bd8714 (diff) | |
| parent | b43e1065cab4b5be90c016b2f076086b70cd1556 (diff) | |
| download | op-kernel-dev-a090b22f3fafa9340f903834de87552b50c5f2ba.zip op-kernel-dev-a090b22f3fafa9340f903834de87552b50c5f2ba.tar.gz | |
Merge branch 'acpica' into acpi-lpss
The following commits depend on the 'acpica' material.
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/include/asm/acpi.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 0c44630..b31bf97 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -49,10 +49,6 @@ /* Asm macros */ -#define ACPI_ASM_MACROS -#define BREAKPOINT3 -#define ACPI_DISABLE_IRQS() local_irq_disable() -#define ACPI_ENABLE_IRQS() local_irq_enable() #define ACPI_FLUSH_CPU_CACHE() wbinvd() int __acpi_acquire_global_lock(unsigned int *lock); |
