diff options
| author | Jesper Nilsson <jesper@jni.nu> | 2008-06-30 18:14:13 -0400 |
|---|---|---|
| committer | Jesper Nilsson <jesper@jni.nu> | 2008-06-30 18:14:13 -0400 |
| commit | d17ffb4c9d86194bb74cbc30f4b65de59c27f6cd (patch) | |
| tree | 18e5dc8372fe35d4ff91ab5576af69616082ed3d | |
| parent | e05f86c13bca8eac80bccd1e86f3e09a7d3ae963 (diff) | |
| parent | bd451d5ed206cda4ed0e03fac4e5dece2fd7767f (diff) | |
Merge branch 'cris_debug_port_fix' into 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) | |||
| 432 | } | 432 | } |
| 433 | 433 | ||
| 434 | static const struct tty_operations dummy_ops = { | 434 | static const struct tty_operations dummy_ops = { |
| 435 | .open = dummy_open, | 435 | .open = dummy_open, |
| 436 | .close = dummy_close, | 436 | .close = dummy_close, |
| 437 | .write = dummy_write, | 437 | .write = dummy_write, |
| 438 | .write_room = dummy_write_room, | 438 | .write_room = dummy_write_room, |
| 439 | }; | 439 | }; |
| 440 | 440 | ||
| 441 | void __init | 441 | void __init |