diff options
author | Jesper Nilsson <jesper@jni.nu> | 2008-07-01 00:14:13 +0200 |
---|---|---|
committer | Jesper Nilsson <jesper@jni.nu> | 2008-07-01 00:14:13 +0200 |
commit | d17ffb4c9d86194bb74cbc30f4b65de59c27f6cd (patch) | |
tree | 18e5dc8372fe35d4ff91ab5576af69616082ed3d /arch/cris | |
parent | e05f86c13bca8eac80bccd1e86f3e09a7d3ae963 (diff) | |
parent | bd451d5ed206cda4ed0e03fac4e5dece2fd7767f (diff) | |
download | linux-d17ffb4c9d86194bb74cbc30f4b65de59c27f6cd.tar.gz linux-d17ffb4c9d86194bb74cbc30f4b65de59c27f6cd.tar.bz2 linux-d17ffb4c9d86194bb74cbc30f4b65de59c27f6cd.zip |
Merge branch 'cris_debug_port_fix' into cris
Diffstat (limited to 'arch/cris')
-rw-r--r-- | arch/cris/arch-v10/kernel/debugport.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/cris/arch-v10/kernel/debugport.c b/arch/cris/arch-v10/kernel/debugport.c index 162730eb887b..3dc6e91ba39e 100644 --- a/arch/cris/arch-v10/kernel/debugport.c +++ b/arch/cris/arch-v10/kernel/debugport.c @@ -432,10 +432,10 @@ static int dummy_write_room(struct tty_struct *tty) } static const struct tty_operations dummy_ops = { - .open = dummy_open, - .close = dummy_close, - .write = dummy_write, - .write_room = dummy_write_room, + .open = dummy_open, + .close = dummy_close, + .write = dummy_write, + .write_room = dummy_write_room, }; void __init |