diff options
author | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
---|---|---|
committer | Anton Altaparmakov <aia21@cantab.net> | 2005-06-26 17:19:40 -0400 |
commit | 2a322e4c08be4e7cb0c04b427ddaaa679fd88863 (patch) | |
tree | ad8cc17bfd3b5e57e36f07a249028667d72f0b96 /arch/xtensa/platform-iss/console.c | |
parent | ba6d2377c85c9b8a793f455d8c9b6cf31985d70f (diff) | |
parent | 8678887e7fb43cd6c9be6c9807b05e77848e0920 (diff) |
Automatic merge with /usr/src/ntfs-2.6.git.
Diffstat (limited to 'arch/xtensa/platform-iss/console.c')
-rw-r--r-- | arch/xtensa/platform-iss/console.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/xtensa/platform-iss/console.c b/arch/xtensa/platform-iss/console.c index 9e2b53f6a907..4fbddf92a921 100644 --- a/arch/xtensa/platform-iss/console.c +++ b/arch/xtensa/platform-iss/console.c | |||
@@ -198,9 +198,6 @@ static int rs_read_proc(char *page, char **start, off_t off, int count, | |||
198 | } | 198 | } |
199 | 199 | ||
200 | 200 | ||
201 | int register_serial(struct serial_struct*); | ||
202 | void unregister_serial(int); | ||
203 | |||
204 | static struct tty_operations serial_ops = { | 201 | static struct tty_operations serial_ops = { |
205 | .open = rs_open, | 202 | .open = rs_open, |
206 | .close = rs_close, | 203 | .close = rs_close, |