diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-04 11:55:57 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-04 11:55:57 -0500 |
| commit | d1398a6ff503a849f3c123bc5f0fdff383a1b6ec (patch) | |
| tree | 55f305f0170e667d2f1719be257ec8cf3ef7c6e6 /arch/i386 | |
| parent | 69e4d94818cabf44d845b9f4b46d88de6e518dcf (diff) | |
| parent | 0b67d94659a72734584a40b5e113e9261f97ae8c (diff) | |
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: asus_acpi: new MAINTAINER
ACPI: fix section mis-match build warning
ACPI: increase ACPI_MAX_REFERENCE_COUNT for larger systems
ACPI: EC: move verbose printk to debug build only
backlight: fix backlight_device_register compile failures
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/kernel/acpi/boot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c index 094300b3a81f..cbcb2c27f48b 100644 --- a/arch/i386/kernel/acpi/boot.c +++ b/arch/i386/kernel/acpi/boot.c | |||
| @@ -333,7 +333,7 @@ acpi_parse_ioapic(acpi_table_entry_header * header, const unsigned long end) | |||
| 333 | /* | 333 | /* |
| 334 | * Parse Interrupt Source Override for the ACPI SCI | 334 | * Parse Interrupt Source Override for the ACPI SCI |
| 335 | */ | 335 | */ |
| 336 | static void acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger) | 336 | static void __init acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger) |
| 337 | { | 337 | { |
| 338 | if (trigger == 0) /* compatible SCI trigger is level */ | 338 | if (trigger == 0) /* compatible SCI trigger is level */ |
| 339 | trigger = 3; | 339 | trigger = 3; |