ISAPNP breakage in serial.c (2.5.1)

PATCH New Andrey Panin 1 participant 1 message Dec 17, 2001

lore

Share & tools

lore

Andrey Panin

author

2001-12-17 10:00 UTC #0 lore raw

PATCH 1/1 __ISAPNP__ breakage in serial.c (2.5.1)

Hi all,

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

Best regards.

Signature · 2 lines

Andrey Panin            | Embedded systems software engineer
[email protected]        | PGP key: http://www.orbita1.ru/~pazke/AndreyPanin.asc

linux/drivers/char/serial.c renamed from linux.vanilla/drivers/char/serial.c +6 -6

diff -urN -X /usr/dontdiff /linux.vanilla/drivers/char/serial.c /linux/drivers/char/serial.c
@@ -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