Commit 703bc478 authored by Paolo \'Blaisorblade\' Giarrusso's avatar Paolo \'Blaisorblade\' Giarrusso Committed by Linus Torvalds

[PATCH] uml: fix an "unused" warnings

Fixes some random warnings.  To avoid "defined but not used" for
not_configged_ops, make it be defined only if at least one channel is not
defined.
Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade_spam@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent e02c6482
...@@ -72,6 +72,10 @@ config XTERM_CHAN ...@@ -72,6 +72,10 @@ config XTERM_CHAN
well, since UML's gdb currently requires an xterm. well, since UML's gdb currently requires an xterm.
It is safe to say 'Y' here. It is safe to say 'Y' here.
config NOCONFIG_CHAN
bool
default !(XTERM_CHAN && TTY_CHAN && PTY_CHAN && PORT_CHAN && FD_CHAN && NULL_CHAN)
config CON_ZERO_CHAN config CON_ZERO_CHAN
string "Default main console channel initialization" string "Default main console channel initialization"
default "fd:0,fd:1" default "fd:0,fd:1"
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "line.h" #include "line.h"
#include "os.h" #include "os.h"
#ifdef CONFIG_NOCONFIG_CHAN
static void *not_configged_init(char *str, int device, struct chan_opts *opts) static void *not_configged_init(char *str, int device, struct chan_opts *opts)
{ {
printk(KERN_ERR "Using a channel type which is configured out of " printk(KERN_ERR "Using a channel type which is configured out of "
...@@ -87,6 +88,7 @@ static struct chan_ops not_configged_ops = { ...@@ -87,6 +88,7 @@ static struct chan_ops not_configged_ops = {
.free = not_configged_free, .free = not_configged_free,
.winch = 0, .winch = 0,
}; };
#endif /* CONFIG_NOCONFIG_CHAN */
void generic_close(int fd, void *unused) void generic_close(int fd, void *unused)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment