2.2.10 PATCH so that tunelp can compile again

Adam J. Richter (adam@yggdrasil.com)
Wed, 16 Jun 1999 12:18:14 -0700

2.2.10 and 2.3.6 have a change to include/linux/lp.h that was apparently
intended to fix a problem where some kernel routines were being
exported even when __KERNEL__ was not defined. However, it also
accidentally disabled about half of the hardware related declarations,
causing tunelp to fail to compile. Here is the patch.

Adam J. Richter __ ______________ 4880 Stevens Creek Blvd, Suite 104
adam@yggdrasil.com \ / San Jose, California 95129-1034
+1 408 261-6630 | g g d r a s i l United States of America
fax +1 408 261-6631 "Free Software For The Rest Of Us."

---------------------------CUT HERE-------------------------------------

Index: linux/include/linux/lp.h
===================================================================
RCS file: /usr/src.repository/repository/linux/include/linux/lp.h,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 lp.h
--- linux/include/linux/lp.h 1999/06/15 10:37:20 1.1.1.2
+++ linux/include/linux/lp.h 1999/06/16 19:11:33
@@ -139,6 +139,17 @@
* gets inverted, but it is also active low.
*/

+#define LP_POLLED(minor) (lp_table[(minor)].dev->port->irq == PARPORT_IRQ_NONE)
+#define LP_PREEMPTED(minor) (lp_table[(minor)].dev->port->waithead != NULL)
+
+/*
+ * function prototypes
+ */
+
+extern int lp_init(void);
+
+#endif /* __KERNEL__ */
+
/*
* bit defines for 8255 status port
* base + 1
@@ -173,16 +184,5 @@
* It is used only in the lp_init() and lp_reset() routine.
*/
#define LP_DELAY 50
-
-#define LP_POLLED(minor) (lp_table[(minor)].dev->port->irq == PARPORT_IRQ_NONE)
-#define LP_PREEMPTED(minor) (lp_table[(minor)].dev->port->waithead != NULL)
-
-/*
- * function prototypes
- */
-
-extern int lp_init(void);
-
-#endif

#endif

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/