diff options
| author | Len Brown <len.brown@intel.com> | 2009-09-19 06:06:59 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2009-09-19 06:06:59 +0200 |
| commit | 71fd68e7d234f6b7d8407c8f486764d24f8411f4 (patch) | |
| tree | 6dc2a4c356b4f454fc85d0c7cb019986f6f4993b /drivers/acpi/blacklist.c | |
| parent | Merge branch 'bugzilla-13002' into release (diff) | |
| parent | Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | linux-71fd68e7d234f6b7d8407c8f486764d24f8411f4.tar.xz linux-71fd68e7d234f6b7d8407c8f486764d24f8411f4.zip | |
Merge branch 'linus' into release
Diffstat (limited to 'drivers/acpi/blacklist.c')
| -rw-r--r-- | drivers/acpi/blacklist.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c index f6baa77deefb..0c4ca4d318b3 100644 --- a/drivers/acpi/blacklist.c +++ b/drivers/acpi/blacklist.c @@ -78,9 +78,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; |