aboutsummaryrefslogtreecommitdiff
path: root/drivers/acpi/glue.c
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2007-02-15 22:46:42 -0500
committerLen Brown <len.brown@intel.com>2007-02-15 22:46:42 -0500
commit8d4956c201c2f7683289f70095443c59a39f94ef (patch)
tree49a84169b5a673553353991bc0cf9418ef954100 /drivers/acpi/glue.c
parent243b66e76ab722cdec1921d7f80c0cb808131c37 (diff)
ACPI: remove non-PNPACPI version of get_rtc_dev()
It isn't needed in ACPI code anymore because now ACPI always includes PNPACPI. Cc: David Brownell <david-b@pacbell.net> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi/glue.c')
-rw-r--r--drivers/acpi/glue.c27
1 files changed, 0 insertions, 27 deletions
diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c
index 99500871e3f..4334c208841 100644
--- a/drivers/acpi/glue.c
+++ b/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 <linux/platform_device.h>
-
-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();