Merge branch 'linus' into sfi-release

[pandora-kernel.git] / drivers / acpi / blacklist.c

diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index 19152ea..e56b2a7 100644 (file)
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -80,9 +80,10 @@ static struct acpi_blacklist_item acpi_blacklist[] __initdata = {
 
 static int __init blacklist_by_year(void)
 {
-       int year = dmi_get_year(DMI_BIOS_DATE);
+       int year;
+
        /* Doesn't exist? Likely an old system */
-       if (year == -1) {
+       if (!dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL)) {
                printk(KERN_ERR PREFIX "no DMI BIOS year, "
                        "acpi=force is required to enable ACPI\n" );
                return 1;