[PATCH] serial.c ISAPNP fix:

Andrey Panin <pazke@orbita1.ru>: serial.c ISAPNP fix:
  Thist patch fixes buglet which disables ISAPNP support in serial driver.
  __ISAPNP__ conditional symbol is used before isapnp.h is included.


(Included in 2.2)
(Included in 2.4)

drivers/char/serial.c

@@ -122,11 +122,6 @@ static char *serial_revdate = "2001-07-08";
 #define ENABLE_SERIAL_ACPI
 #endif
 
-#ifdef __ISAPNP__
-#ifndef ENABLE_SERIAL_PNP
-#define ENABLE_SERIAL_PNP
-#endif
-#endif
 
 /* Set of debugging defines */
 
@@ -211,9 +206,14 @@ static char *serial_revdate = "2001-07-08";
 #ifdef ENABLE_SERIAL_PCI
 #include <linux/pci.h>
 #endif
-#ifdef ENABLE_SERIAL_PNP
+
 #include <linux/isapnp.h>
+#ifdef __ISAPNP__
+#ifndef ENABLE_SERIAL_PNP
+#define ENABLE_SERIAL_PNP
+#endif
 #endif
+
 #ifdef CONFIG_MAGIC_SYSRQ
 #include <linux/sysrq.h>
 #endif