diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-04-05 04:55:58 +0000 |
| commit | 74a9f2e1b4d3ab45a9f72cb5b556c9f521524ab3 (patch) | |
| tree | 7c4cdb103ab1b388c9852a88bd6fb1e73eba0b5c /drivers/s390 | |
| parent | ee6374c8b0d333c08061c6a97bc77090d7461225 (diff) | |
Merge with Linux 2.4.3.
Note that mingetty does no longer work with serial console, you have to
switch to another getty like getty_ps. This commit also includes a
fix for a setitimer bug which did prevent getty_ps from working on
older kernels.
Diffstat (limited to 'drivers/s390')
| -rw-r--r-- | drivers/s390/char/tape34xx.c | 4 | ||||
| -rw-r--r-- | drivers/s390/net/ctc.c | 2 | ||||
| -rw-r--r-- | drivers/s390/net/netiucv.c | 3 | ||||
| -rw-r--r-- | drivers/s390/s390mach.c | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/drivers/s390/char/tape34xx.c b/drivers/s390/char/tape34xx.c index 24dc79b7e..bcf21734f 100644 --- a/drivers/s390/char/tape34xx.c +++ b/drivers/s390/char/tape34xx.c @@ -1437,7 +1437,7 @@ tape34xx_default_handler (tape_info_t * tape) debug_text_event (tape_debug_area,6,"xdefhandle"); #endif /* TAPE_DEBUG */ tapestate_set (tape, TS_FAILED); - PRINT_ERR ("TAPE34XX: An unexpected Unit Check occured.\n"); + PRINT_ERR ("TAPE34XX: An unexpected Unit Check occurred.\n"); PRINT_ERR ("TAPE34XX: Please read Documentation/s390/TAPE and report it!\n"); PRINT_ERR ("TAPE34XX: Current state is: %s", (((tapestate_get (tape) < TS_SIZE) && (tapestate_get (tape) >= 0)) ? @@ -1804,7 +1804,7 @@ tape34xx_rew_release_init_error (tape_info_t * tape) tape->wanna_wakeup=1; wake_up (&tape->wq); } else { - PRINT_ERR ("TAPE34XX: An unexpected Unit Check occured.\n"); + PRINT_ERR ("TAPE34XX: An unexpected Unit Check occurred.\n"); PRINT_ERR ("TAPE34XX: Please send the following 20 lines of output to cotte@de.ibm.com\n"); PRINT_ERR ("TAPE34XX: Current state is: %s", (((tapestate_get (tape) < TS_SIZE) && (tapestate_get (tape) >= 0)) ? diff --git a/drivers/s390/net/ctc.c b/drivers/s390/net/ctc.c index 0debc8728..f84fd2c47 100644 --- a/drivers/s390/net/ctc.c +++ b/drivers/s390/net/ctc.c @@ -884,7 +884,7 @@ static void inline ccw_check_unit_check (net_device *dev, char sense) if (sense & 0x01) printk(KERN_DEBUG "%s: Interface disconnect or Selective reset occurred (remote side)\n", dev->name); else - printk(KERN_DEBUG "%s: System reset occured (remote side)\n", dev->name); + printk(KERN_DEBUG "%s: System reset occurred (remote side)\n", dev->name); #endif } else if (sense & 0x20) { if (sense & 0x04) diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index daeb4f595..08fd5bdec 100644 --- a/drivers/s390/net/netiucv.c +++ b/drivers/s390/net/netiucv.c @@ -65,9 +65,6 @@ MODULE_PARM (iucv, "1-" __MODULE_STRING (MAX_DEVICES) "s"); MODULE_PARM_DESC (iucv, "Specify the userids associated with iucv0-iucv9:\n" "iucv=userid1,userid2,...,userid10\n"); -#ifdef MODVERSIONS -#include <linux/modversions.h> -#endif #else #define MOD_INC_USE_COUNT #define MOD_DEC_USE_COUNT diff --git a/drivers/s390/s390mach.c b/drivers/s390/s390mach.c index 33ee8a550..b9f5eb9b5 100644 --- a/drivers/s390/s390mach.c +++ b/drivers/s390/s390mach.c @@ -139,7 +139,7 @@ void s390_do_machine_check( void ) #endif memcpy( &mcic, - &S390_lowcore.mcck_interuption_code, + &S390_lowcore.mcck_interruption_code, sizeof(__u64)); if ( mcic.mcc.mcd.cp ) // CRW pending ? |