diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-05-12 21:05:59 +0000 |
| commit | ba2dacab305c598cd4c34a604f8e276bf5bab5ff (patch) | |
| tree | 78670a0139bf4d5ace617b29b7eba82bbc74d602 /arch/m68k | |
| parent | b77bf69998121e689c5e86cc5630d39a0a9ee6ca (diff) | |
Merge with Linux 2.3.99-pre7 and various other bits.
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/atari/atakeyb.c | 3 | ||||
| -rw-r--r-- | arch/m68k/defconfig | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c index 8eeaa8985..ebef991e9 100644 --- a/arch/m68k/atari/atakeyb.c +++ b/arch/m68k/atari/atakeyb.c @@ -287,8 +287,8 @@ static void atakeyb_rep( unsigned long ignore ) /* A keyboard int may have come in before we disabled the irq, so * double-check whether rep_scancode is still != 0 */ if (rep_scancode) { + init_timer(&atakeyb_rep_timer); atakeyb_rep_timer.expires = jiffies + key_repeat_rate; - atakeyb_rep_timer.prev = atakeyb_rep_timer.next = NULL; add_timer( &atakeyb_rep_timer ); handle_scancode(rep_scancode, 1); @@ -444,7 +444,6 @@ static void keyboard_interrupt(int irq, void *dummy, struct pt_regs *fp) del_timer( &atakeyb_rep_timer ); rep_scancode = scancode; atakeyb_rep_timer.expires = jiffies + key_repeat_delay; - atakeyb_rep_timer.prev = atakeyb_rep_timer.next = NULL; add_timer( &atakeyb_rep_timer ); } diff --git a/arch/m68k/defconfig b/arch/m68k/defconfig index 400e38961..76a204f62 100644 --- a/arch/m68k/defconfig +++ b/arch/m68k/defconfig @@ -235,6 +235,7 @@ CONFIG_MINIX_FS=y # CONFIG_HPFS_FS is not set CONFIG_PROC_FS=y # CONFIG_DEVFS_FS is not set +# CONFIG_DEVFS_MOUNT is not set # CONFIG_DEVFS_DEBUG is not set CONFIG_DEVPTS_FS=y # CONFIG_QNX4FS_FS is not set |