From cd556ac227a0985888356def62f475eec3468c94 Mon Sep 17 00:00:00 2001 From: Len Brown Date: Thu, 15 Feb 2007 22:46:42 -0500 Subject: [PATCH] --- yaml --- r: 48675 b: refs/heads/master c: 8d4956c201c2f7683289f70095443c59a39f94ef h: refs/heads/master i: 48673: 1389f98b74952a6a228cee549debec83d7d7fae7 48671: 4cc991f9109d73739eed66f9d4c23c7ecbd402e9 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/glue.c | 27 --------------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/[refs] b/[refs] index 35fdf968cee6..abc4ae048895 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 243b66e76ab722cdec1921d7f80c0cb808131c37 +refs/heads/master: 8d4956c201c2f7683289f70095443c59a39f94ef diff --git a/trunk/drivers/acpi/glue.c b/trunk/drivers/acpi/glue.c index 99500871e3fe..4334c208841a 100644 --- a/trunk/drivers/acpi/glue.c +++ b/trunk/drivers/acpi/glue.c @@ -255,8 +255,6 @@ arch_initcall(init_acpi_device_notify); static struct cmos_rtc_board_info rtc_info; -#ifdef CONFIG_PNPACPI - /* PNP devices are registered in a subsys_initcall(); * ACPI specifies the PNP IDs to use. */ @@ -280,31 +278,6 @@ static struct device *__init get_rtc_dev(void) return bus_find_device(&pnp_bus_type, NULL, NULL, pnp_match); } -#else - -/* We expect non-PNPACPI platforms to register an RTC device, usually - * at or near arch_initcall(). That also helps for example PCs that - * aren't configured with ACPI (where this code wouldn't run, but the - * RTC would still be available). The device name matches the driver; - * that's how the platform bus works. - */ -#include - -static int __init platform_match(struct device *dev, void *data) -{ - struct platform_device *pdev; - - pdev = container_of(dev, struct platform_device, dev); - return strcmp(pdev->name, "rtc_cmos") == 0; -} - -static struct device *__init get_rtc_dev(void) -{ - return bus_find_device(&platform_bus_type, NULL, NULL, platform_match); -} - -#endif - static int __init acpi_rtc_init(void) { struct device *dev = get_rtc_dev();