Better 2.2.10 PATCH to include/linux/lp.h

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

Oops! I the patch I justed posted for linux-2.2.10/include/linux/lp.h
(and linux-2.3.6) to reenable the export of some presumably accidentally
disabled hardware declarations that tunelp needs, I accidentally left
a comment in the wrong place. Of course, it makes no difference to
the compiler, but please apply this patch instead of the one I posted before.

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---------------------------------

--- include/linux/lp.h.orig Mon Jun 7 11:05:31 1999
+++ include/linux/lp.h Wed Jun 16 12:25:36 1999
@@ -131,6 +131,17 @@
volatile unsigned int irq_missed:1;
};

+#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__ */
+
/*
* The following constants describe the various signals of the printer port
* hardware. Note that the hardware inverts some signals and that some
@@ -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/