Skip to content

L
linux
Commit 934b1308 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

into home.transmeta.com:/home/torvalds/v2.5/linux
parents 33f7ca2b 0b071134
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 137 deletions
drivers/net/wireless/wavelan_cs.p.h
View file @ 934b1308
...@@ -499,7 +499,7 @@ ...@@ -499,7 +499,7 @@
#undef DEBUG_RX_INFO /* Header of the transmitted packet */ #undef DEBUG_RX_INFO /* Header of the transmitted packet */
#undef DEBUG_RX_FAIL /* Normal failure conditions */ #undef DEBUG_RX_FAIL /* Normal failure conditions */
#define DEBUG_RX_ERROR /* Unexpected 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_TRACE /* Misc call by Linux */
#undef DEBUG_IOCTL_INFO /* Various debug info */ #undef DEBUG_IOCTL_INFO /* Various debug info */
#define DEBUG_IOCTL_ERROR /* What's going wrong */ #define DEBUG_IOCTL_ERROR /* What's going wrong */
......
drivers/scsi/i91uscsi.c
View file @ 934b1308
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7