Merge branch 'acpi-config'

* acpi-config:
  ACPI: delete CONFIG_ACPI_BLACKLIST_YEAR

2 files changed, 0 insertions, 46 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index c95df0b8c880..5d9248526d78 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -235,17 +235,6 @@ config ACPI_INITRD_TABLE_OVERRIDE
           initrd, therefore it's safe to say Y.
           See Documentation/acpi/initrd_table_override.txt for details
 
-config ACPI_BLACKLIST_YEAR
-        int "Disable ACPI for systems before Jan 1st this year" if X86_32
-        default 0
-        help
-          Enter a 4-digit year, e.g., 2001, to disable ACPI by default
-          on platforms with DMI BIOS date before January 1st that year.
-          "acpi=force" can be used to override this mechanism.
-
-          Enter 0 to disable this mechanism and allow ACPI to
-          run by default no matter what the year.  (default)
-
 config ACPI_DEBUG
         bool "Debug Statements"
         default n
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/blacklist.c
index fb848378d582..078c4f7fe2dd 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/blacklist.c
@@ -75,39 +75,6 @@ static struct acpi_blacklist_item acpi_blacklist[] __initdata = {
         {""}
 };
 
-#if     CONFIG_ACPI_BLACKLIST_YEAR
-
-static int __init blacklist_by_year(void)
-{
-        int year;
-
-        /* Doesn't exist? Likely an old system */
-        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;
-        }
-        /* 0? Likely a buggy new BIOS */
-        if (year == 0) {
-                printk(KERN_ERR PREFIX "DMI BIOS year==0, "
-                        "assuming ACPI-capable machine\n" );
-                return 0;
-        }
-        if (year < CONFIG_ACPI_BLACKLIST_YEAR) {
-                printk(KERN_ERR PREFIX "BIOS age (%d) fails cutoff (%d), "
-                       "acpi=force is required to enable ACPI\n",
-                       year, CONFIG_ACPI_BLACKLIST_YEAR);
-                return 1;
-        }
-        return 0;
-}
-#else
-static inline int blacklist_by_year(void)
-{
-        return 0;
-}
-#endif
-
 int __init acpi_blacklisted(void)
 {
         int i = 0;
@@ -166,8 +133,6 @@ int __init acpi_blacklisted(void)
                 }
         }
 
-        blacklisted += blacklist_by_year();
-
         dmi_check_system(acpi_osi_dmi_table);
 
         return blacklisted;