diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-02-16 01:07:24 +0000 |
| commit | 95db6b748fc86297827fbd9c9ef174d491c9ad89 (patch) | |
| tree | 27a92a942821cde1edda9a1b088718d436b3efe4 /drivers/sbus | |
| parent | 45b27b0a0652331d104c953a5b192d843fff88f8 (diff) | |
Merge with Linux 2.3.40.
Diffstat (limited to 'drivers/sbus')
| -rw-r--r-- | drivers/sbus/char/envctrl.c | 6 | ||||
| -rw-r--r-- | drivers/sbus/char/pcikbd.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c index 92f064f25..602c7b670 100644 --- a/drivers/sbus/char/envctrl.c +++ b/drivers/sbus/char/envctrl.c @@ -1,4 +1,4 @@ -/* $Id: envctrl.c,v 1.13 1999/12/19 23:28:07 davem Exp $ +/* $Id: envctrl.c,v 1.14 2000/01/09 15:43:45 ecd Exp $ * envctrl.c: Temperature and Fan monitoring on Machines providing it. * * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be) @@ -29,8 +29,8 @@ #undef U450_SUPPORT /* might fry you machine, careful here !!! */ -#define DEBUG 1 -#define DEBUG_BUS_SCAN 1 +#undef DEBUG +#undef DEBUG_BUS_SCAN #if LINUX_VERSION_CODE < KERNEL_VERSION(2,2,0) diff --git a/drivers/sbus/char/pcikbd.c b/drivers/sbus/char/pcikbd.c index 238b76006..1c5846ade 100644 --- a/drivers/sbus/char/pcikbd.c +++ b/drivers/sbus/char/pcikbd.c @@ -1,4 +1,4 @@ -/* $Id: pcikbd.c,v 1.40 1999/12/01 10:45:53 davem Exp $ +/* $Id: pcikbd.c,v 1.41 2000/01/08 07:01:20 davem Exp $ * pcikbd.c: Ultra/AX PC keyboard support. * * Copyright (C) 1997 Eddie C. Dost (ecd@skynet.be) |