patch-2.1.131 linux/init/main.c

• Lines: 29
• Date: Sun Nov 29 10:37:02 1998
• Orig file: v2.1.130/linux/init/main.c
• Orig date: Fri Nov 27 13:09:29 1998

diff -u --recursive --new-file v2.1.130/linux/init/main.c linux/init/main.c
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/smp_lock.h>
 #include <linux/blk.h>
+#include <linux/hdreg.h>
 
 #include <asm/io.h>
 #include <asm/bugs.h>
@@ -41,6 +42,10 @@
 #  include <asm/mtrr.h>
 #endif
 
+#ifdef CONFIG_APM
+#include <linux/apm_bios.h>
+#endif
+
 /*
  * Versions of gcc older than that listed below may actually compile
  * and link okay, but the end product can have subtle run time bugs.
@@ -864,6 +869,9 @@
 #endif
 #ifdef CONFIG_PARIDE_PG
         { "pg.", pg_setup },
+#endif
+#ifdef CONFIG_APM
+	{ "apm=", apm_setup },
 #endif
 	{ 0, 0 }
 };