patch-2.3.25 linux/arch/i386/kernel/apm.c

• Lines: 57
• Date: Mon Nov 1 13:33:04 1999
• Orig file: v2.3.24/linux/arch/i386/kernel/apm.c
• Orig date: Mon Oct 11 15:38:14 1999

diff -u --recursive --new-file v2.3.24/linux/arch/i386/kernel/apm.c linux/arch/i386/kernel/apm.c
@@ -1,8 +1,8 @@
 /* -*- linux-c -*-
  * APM BIOS driver for Linux
- * Copyright 1994-1998 Stephen Rothwell
- *                     (Stephen.Rothwell@canb.auug.org.au)
- * Development of this driver was funded by NEC Australia P/L
+ * Copyright 1994-1999 Stephen Rothwell (sfr@linuxcare.com)
+ *
+ * Initial development of this driver was funded by NEC Australia P/L
  *	and NEC Corporation
  *
  * This program is free software; you can redistribute it and/or modify it
@@ -133,6 +133,12 @@
 #include <asm/uaccess.h>
 #include <asm/desc.h>
 
+/*
+ * Make APM look as much as just another ACPI module as possible..
+ */
+#include <linux/acpi.h>
+
+
 EXPORT_SYMBOL(apm_register_callback);
 EXPORT_SYMBOL(apm_unregister_callback);
 
@@ -1400,6 +1406,11 @@
 			apm_bios_info.flags &= ~APM_BIOS_DISENGAGED;
 	}
 
+/* Install our power off handler.. */
+#ifdef CONFIG_APM_POWER_OFF
+	acpi_power_off = apm_power_off;
+#endif
+
 	apm_mainloop();
 	return 0;
 }
@@ -1441,8 +1452,6 @@
  */
 static int __init apm_init(void)
 {
-	static struct proc_dir_entry *ent;
-
 	if (apm_bios_info.version == 0) {
 		printk(KERN_INFO "apm: BIOS not found.\n");
 		return -1;
@@ -1536,9 +1545,7 @@
 	}
 #endif
 
-	ent = create_proc_entry("apm", 0, 0);
-	if (ent != NULL)
-		ent->get_info = apm_get_info;
+ 	create_proc_info_entry("apm", 0, 0, apm_get_info);
 
 	misc_register(&apm_device);