[PATCH] __ISAPNP__ breakage in serial.c (2.5.1)

[PATCH] __ISAPNP__ breakage in serial.c (2.5.1)

[Andrey Panin]

[-- Attachment #1.1: Type: text/plain, Size: 298 bytes --]

Hi all,

in serial driver __ISAPNP__ conditional symbol is used before 
isapnp.h file is included. Quick and dirty fix attached.

Best regards.

-- 
Andrey Panin            | Embedded systems software engineer
pazke@orbita1.ru        | PGP key: http://www.orbita1.ru/~pazke/AndreyPanin.asc

[-- Attachment #1.2: patch-serial-isapnp --]
[-- Type: text/plain, Size: 718 bytes --]

diff -urN -X /usr/dontdiff /linux.vanilla/drivers/char/serial.c /linux/drivers/char/serial.c
--- /linux.vanilla/drivers/char/serial.c	Mon Dec 17 17:44:31 2001
+++ /linux/drivers/char/serial.c	Tue Dec 18 00:13:01 2001
@@ -122,11 +122,6 @@
 #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 @@
 #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

[-- Attachment #2: Type: application/pgp-signature, Size: 232 bytes --]