diff options
| author |  Linus Torvalds <torvalds@g5.osdl.org>
| 2006-06-23 07:52:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org>
| 2006-06-23 07:52:36 -0700 |
| commit | 37224470c8c6d90a4062e76a08d4dc1fcf91fc89 (patch) | |
| tree | 627f537177bf8e951c12bec04c4a85f0125f5ece /include/asm-i386 | |
| parent | [PATCH] docs: update sparse.txt with CHECK_ENDIAN (diff) | |
| parent | merge linus into release branch (diff) | |
| download | linux-37224470c8c6d90a4062e76a08d4dc1fcf91fc89.tar.gz linux-37224470c8c6d90a4062e76a08d4dc1fcf91fc89.tar.bz2 linux-37224470c8c6d90a4062e76a08d4dc1fcf91fc89.zip | |
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: (65 commits)
ACPI: suppress power button event on S3 resume
ACPI: resolve merge conflict between sem2mutex and processor_perflib.c
ACPI: use for_each_possible_cpu() instead of for_each_cpu()
ACPI: delete newly added debugging macros in processor_perflib.c
ACPI: UP build fix for bugzilla-5737
Enable P-state software coordination via _PDC
P-state software coordination for speedstep-centrino
P-state software coordination for acpi-cpufreq
P-state software coordination for ACPI core
ACPI: create acpi_thermal_resume()
ACPI: create acpi_fan_suspend()/acpi_fan_resume()
ACPI: pass pm_message_t from acpi_device_suspend() to root_suspend()
ACPI: create acpi_device_suspend()/acpi_device_resume()
ACPI: replace spin_lock_irq with mutex for ec poll mode
ACPI: Allow a WAN module enable/disable on a Thinkpad X60.
sem2mutex: acpi, acpi_link_lock
ACPI: delete unused acpi_bus_drivers_lock
sem2mutex: drivers/acpi/processor_perflib.c
ACPI add ia64 exports to build acpi_memhotplug as a module
ACPI: asus_acpi_init(): propagate correct return value
...
Manual resolve of conflicts in:
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
include/acpi/processor.h
Diffstat (limited to 'include/asm-i386')
| -rw-r--r-- | include/asm-i386/apicdef.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-i386/apicdef.h b/include/asm-i386/apicdef.h index 5e4a35af2921..9f6995341fdc 100644 --- a/include/asm-i386/apicdef.h +++ b/include/asm-i386/apicdef.h @@ -121,7 +121,6 @@ */ #define u32 unsigned int -#define lapic ((volatile struct local_apic *)APIC_BASE) struct local_apic { |