diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-07 13:52:00 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-07 13:52:00 -0400 |
| commit | ba00003aa83a61b615542dd66f5af8fb4a7cee1d (patch) | |
| tree | 013dde7e89730e54433aa40b5e9d67997931aed6 /drivers/char | |
| parent | 9c8e7f5cc965d30006c917ab19221e06fcc5a4f9 (diff) | |
| parent | 40a5f7ca07f8e1d77acdba5ae0c11c15cb7520c1 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] PReP fixup after irq changes
[POWERPC] SPU fixup after irq changes
[POWERPC] Fix up after irq changes
[POWERPC] Fix iseries/smp.c for irq breakage
[POWERPC] Fix viocons for irq breakage
[POWERPC] Update iseries_defconfig
[POWERPC] Fix fsl_soc build breaks
[POWERPC] Minor fix for bootargs property
[POWERPC] Update MTFSF_L() comment
[POWERPC] Update pSeries defconfig for SATA
[POWERPC] Don't get PCI IRQ from OF for devices with no IRQ
[POWERPC] Fix zImage decompress location
[POWERPC] linux,tce-size property is 32 bits
[POWERPC] Add DTS for MPC8349E-mITX board
[POWERPC] Fix harmless typo
[PPC] Fix some irq breakage with ARCH=ppc
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/viocons.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/viocons.c b/drivers/char/viocons.c index a362ee9c92dd..6d2e314860df 100644 --- a/drivers/char/viocons.c +++ b/drivers/char/viocons.c | |||
| @@ -947,7 +947,7 @@ static void vioHandleData(struct HvLpEvent *event) | |||
| 947 | */ | 947 | */ |
| 948 | continue; | 948 | continue; |
| 949 | } else if (vio_sysrq_pressed) { | 949 | } else if (vio_sysrq_pressed) { |
| 950 | handle_sysrq(cevent->data[index], NULL, tty); | 950 | handle_sysrq(cevent->data[index], tty); |
| 951 | vio_sysrq_pressed = 0; | 951 | vio_sysrq_pressed = 0; |
| 952 | /* | 952 | /* |
| 953 | * continue because we don't want to add | 953 | * continue because we don't want to add |