aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-16 22:10:32 -0500
committerLen Brown <len.brown@intel.com>2007-02-16 22:10:32 -0500
commitc0cd79d11412969b6b8fa1624cdc1277db82e2fe (patch)
tree100ee9bb6f13fc0fb3d1887516712541a5fc0769 /arch/ia64
parent81450b73dde07f473a4a7208b209b4c8b7251d90 (diff)
parentdb2d4ccdc8f9f3433d3a8566404189f2e9295c23 (diff)
downloadkernel_samsung_smdk4412-c0cd79d11412969b6b8fa1624cdc1277db82e2fe.zip
kernel_samsung_smdk4412-c0cd79d11412969b6b8fa1624cdc1277db82e2fe.tar.gz
kernel_samsung_smdk4412-c0cd79d11412969b6b8fa1624cdc1277db82e2fe.tar.bz2
Pull fluff into release branch
Conflicts: arch/x86_64/pci/mmconfig.c drivers/acpi/bay.c Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kernel/acpi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 9197d7b..3549c94 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -651,7 +651,7 @@ int __init acpi_boot_init(void)
* information -- the successor to MPS tables.
*/
- if (acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt) < 1) {
+ if (acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt)) {
printk(KERN_ERR PREFIX "Can't find MADT\n");
goto skip_madt;
}
@@ -702,7 +702,7 @@ int __init acpi_boot_init(void)
* gets interrupts such as power and sleep buttons. If it's not
* on a Legacy interrupt, it needs to be setup.
*/
- if (acpi_table_parse(ACPI_SIG_FADT, acpi_parse_fadt) < 1)
+ if (acpi_table_parse(ACPI_SIG_FADT, acpi_parse_fadt))
printk(KERN_ERR PREFIX "Can't find FADT\n");
#ifdef CONFIG_SMP