From 0b7bb11321bf012ed55eae0d7cb3bf4d04e36bae Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 18 Jul 2008 02:07:02 +0200 Subject: [PATCH] APCI: revert another duplicated patch commit ca570882bd1d7c9987924f041105219fb98c5bfe ("ACPI: don't walk tables if ACPI was disabled") is another superfluous duplicate commit caused by git -> quilt -> git conversion. Revert it. Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds --- drivers/acpi/glue.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 0f2dd81736bda..2f173e83f8a76 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c @@ -335,9 +335,6 @@ static int __init acpi_rtc_init(void) { struct device *dev = get_rtc_dev(); - if (acpi_disabled) - return 0; - if (acpi_disabled) return 0; -- 2.39.5