A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 03:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'x86/apic' into irq/numa

Browse source 
Merge reason: both topics modify the APIC code but were able to do it in
              parallel so far. An upcoming patch generates a conflict so
              merge them to avoid the conflict.

Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
Ingo Molnar 2009-05-12 12:17:30 +02:00
commit 6cda3eb62e
573 changed files with 16237 additions and 15591 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/acpi/acpica/rscalc.c
View file

@ -543,6 +543,13 @@ acpi_rs_get_pci_routing_table_length(union acpi_operand_object *package_object,
package_element = *top_object_list;
/* We must have a valid Package object */
if (!package_element ||
(package_element->common.type != ACPI_TYPE_PACKAGE)) {
return_ACPI_STATUS (AE_AML_OPERAND_TYPE);
}
/*
* The sub_object_list will now point to an array of the
* four IRQ elements: Address, Pin, Source and source_index

3
drivers/acpi/video.c
View file

@ -2296,7 +2296,7 @@ static int __init acpi_video_init(void)
return acpi_video_register();
}
static void __exit acpi_video_exit(void)
void __exit acpi_video_exit(void)
{
acpi_bus_unregister_driver(&acpi_video_bus);
@ -2305,6 +2305,7 @@ static void __exit acpi_video_exit(void)
return;
}
EXPORT_SYMBOL(acpi_video_exit);
module_init(acpi_video_init);
module_exit(acpi_video_exit);