patch-2.3.49 linux/drivers/pcmcia/cs.c

• Lines: 27
• Date: Mon Feb 28 07:16:54 2000
• Orig file: v2.3.48/linux/drivers/pcmcia/cs.c
• Orig date: Sun Feb 20 21:12:39 2000

diff -u --recursive --new-file v2.3.48/linux/drivers/pcmcia/cs.c linux/drivers/pcmcia/cs.c
@@ -82,14 +82,12 @@
 #else
 #define CB_OPT ""
 #endif
-#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) || defined(CONFIG_ACPI)
-#define APM_OPT " [apm]"
+#ifdef CONFIG_PM
+#define APM_OPT " [pm]"
 #else
 #define APM_OPT ""
 #endif
-#if !defined(CONFIG_CARDBUS) && !defined(CONFIG_PCI) && \
-    !defined(CONFIG_APM) && !defined(CONFIG_APM_MODULE) && \
-    !defined(CONFIG_ACPI)
+#if !defined(CONFIG_CARDBUS) && !defined(CONFIG_PCI) && !defined(CONFIG_PM)
 #define OPTIONS " none"
 #else
 #define OPTIONS PCI_OPT CB_OPT APM_OPT
@@ -125,7 +123,7 @@
 static int io_speed		= 0;	/* ns */
 
 /* Optional features */
-#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE) || defined(CONFIG_ACPI)
+#ifdef CONFIG_PM
 static int do_apm		= 1;
 MODULE_PARM(do_apm, "i");
 #else