diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 18:24:00 +0200 |
commit | 83bd6998b04fc1bb7280b14f16b2bdbdc07c914b (patch) | |
tree | af1bbe2bac5752b69b1ac58bf5d822c735da439b /drivers/char/hvcs.c | |
parent | x86: hpet: modify IXP400 quirk to enable interrupts (diff) | |
parent | Linux 2.6.27-rc6 (diff) | |
download | linux-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.tar.xz linux-83bd6998b04fc1bb7280b14f16b2bdbdc07c914b.zip |
Merge commit 'v2.6.27-rc6' into timers/hpet
Diffstat (limited to 'drivers/char/hvcs.c')
-rw-r--r-- | drivers/char/hvcs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/hvcs.c b/drivers/char/hvcs.c index 786d518e9477..473d9b14439a 100644 --- a/drivers/char/hvcs.c +++ b/drivers/char/hvcs.c @@ -114,7 +114,7 @@ * the hvcs_final_close() function in order to get it out of the spinlock. * Rearranged hvcs_close(). Cleaned up some printks and did some housekeeping * on the changelog. Removed local CLC_LENGTH and used HVCS_CLC_LENGTH from - * include/asm-powerpc/hvcserver.h + * arch/powerepc/include/asm/hvcserver.h * * 1.3.2 -> 1.3.3 Replaced yield() in hvcs_close() with tty_wait_until_sent() to * prevent possible lockup with realtime scheduling as similarily pointed out by |