diff options
author | Yoann Padioleau <padator@wanadoo.fr> | 2007-06-08 16:46:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-08 20:23:33 -0400 |
commit | a17627ef8833ac30622a7b39b7be390e1b174405 (patch) | |
tree | 536eb5292376473627d704ea2281239a1ab5b4fa /drivers | |
parent | 3cdc0ed0cea50ea08dd146c1bbc82b1bcc2e1b80 (diff) |
potential parse error in ifdef part 3
Fix various bits of obviously-busted code which we're not happening to
compile, due to ifdefs.
Signed-off-by: Yoann Padioleau <padator@wanadoo.fr>
Cc: Andi Kleen <ak@suse.de>
Cc: Paul Mackerras <paulus@samba.org>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Cc: Jens Axboe <jens.axboe@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/cdrom/mcdx.c | 2 | ||||
-rw-r--r-- | drivers/tc/zs.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/cdrom/mcdx.c b/drivers/cdrom/mcdx.c index f574962f4288..4310cc84dfed 100644 --- a/drivers/cdrom/mcdx.c +++ b/drivers/cdrom/mcdx.c | |||
@@ -1053,11 +1053,11 @@ static void __exit mcdx_exit(void) | |||
1053 | if (unregister_blkdev(MAJOR_NR, "mcdx") != 0) { | 1053 | if (unregister_blkdev(MAJOR_NR, "mcdx") != 0) { |
1054 | xwarn("cleanup() unregister_blkdev() failed\n"); | 1054 | xwarn("cleanup() unregister_blkdev() failed\n"); |
1055 | } | 1055 | } |
1056 | blk_cleanup_queue(mcdx_queue); | ||
1057 | #if !MCDX_QUIET | 1056 | #if !MCDX_QUIET |
1058 | else | 1057 | else |
1059 | xinfo("cleanup() succeeded\n"); | 1058 | xinfo("cleanup() succeeded\n"); |
1060 | #endif | 1059 | #endif |
1060 | blk_cleanup_queue(mcdx_queue); | ||
1061 | } | 1061 | } |
1062 | 1062 | ||
1063 | #ifdef MODULE | 1063 | #ifdef MODULE |
diff --git a/drivers/tc/zs.c b/drivers/tc/zs.c index 3524e3fc08b9..61de78a9f6ee 100644 --- a/drivers/tc/zs.c +++ b/drivers/tc/zs.c | |||
@@ -2182,7 +2182,7 @@ struct dec_serial_hook zs_kgdbhook = { | |||
2182 | .init_info = kgdbhook_init_info, | 2182 | .init_info = kgdbhook_init_info, |
2183 | .rx_char = kgdbhook_rx_char, | 2183 | .rx_char = kgdbhook_rx_char, |
2184 | .cflags = B38400 | CS8 | CLOCAL, | 2184 | .cflags = B38400 | CS8 | CLOCAL, |
2185 | } | 2185 | }; |
2186 | 2186 | ||
2187 | void __init zs_kgdb_hook(int tty_num) | 2187 | void __init zs_kgdb_hook(int tty_num) |
2188 | { | 2188 | { |