Merge bk://ppc.bkbits.net/for-linus-ppc

into home.transmeta.com:/home/torvalds/v2.5/linux

Merge bk://ppc.bkbits.net/for-linus-ppc
into home.transmeta.com:/home/torvalds/v2.5/linux
934b1308 · Linus Torvalds · 33f7ca2b · 0b071134 · 934b1308 · 934b1308
Commit 934b1308 authored Jan 03, 2003 by Linus Torvalds
Expand all Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 137 deletions

drivers/net/wireless/wavelan_cs.p.h drivers/net/wireless/wavelan_cs.p.h +1 -1

drivers/scsi/i91uscsi.c drivers/scsi/i91uscsi.c +0 -136

No files found.
--- a/drivers/net/wireless/wavelan_cs.p.h
+++ b/drivers/net/wireless/wavelan_cs.p.h
@@ -499,7 +499,7 @@
 #undef DEBUG_RX_INFO		/* Header of the transmitted packet */
 #undef DEBUG_RX_FAIL		/* Normal failure conditions */
 #define DEBUG_RX_ERROR		/* Unexpected conditions */
-#undef DEBUG_PACKET_DUMP	32	/* Dump packet on the screen */
+#undef DEBUG_PACKET_DUMP	/* Dump packet on the screen */
 #undef DEBUG_IOCTL_TRACE	/* Misc call by Linux */
 #undef DEBUG_IOCTL_INFO		/* Various debug info */
 #define DEBUG_IOCTL_ERROR	/* What's going wrong */

--- a/drivers/scsi/i91uscsi.c
+++ b/drivers/scsi/i91uscsi.c