diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-03-03 09:18:47 -0600 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-03-03 09:18:47 -0600 |
| commit | d4fc7cea5dda04ae1a6f36175ec1dd8ff088ed52 (patch) | |
| tree | 3d65887b06c575a94feed1fd91216e32a62b31d8 /arch/m68k/atari/atakeyb.c | |
| parent | 3a011a171906a3a51a43bb860fb7c66a64cab140 (diff) | |
| parent | 2450cf51a1bdba7037e91b1bcc494b01c58aaf66 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/m68k/atari/atakeyb.c')
| -rw-r--r-- | arch/m68k/atari/atakeyb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/atari/atakeyb.c b/arch/m68k/atari/atakeyb.c index a5f33c059979..4add96d13b19 100644 --- a/arch/m68k/atari/atakeyb.c +++ b/arch/m68k/atari/atakeyb.c @@ -609,10 +609,10 @@ int atari_keyb_init(void) ACIA_RHTID : 0); /* make sure the interrupt line is up */ - } while ((mfp.par_dt_reg & 0x10) == 0); + } while ((st_mfp.par_dt_reg & 0x10) == 0); /* enable ACIA Interrupts */ - mfp.active_edge &= ~0x10; + st_mfp.active_edge &= ~0x10; atari_turnon_irq(IRQ_MFP_ACIA); ikbd_self_test = 1; |