git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
srmcons.c
diff --git
a/arch/alpha/kernel/srmcons.c
b/arch/alpha/kernel/srmcons.c
index
930cedc
..
783f4e5
100644
(file)
--- a/
arch/alpha/kernel/srmcons.c
+++ b/
arch/alpha/kernel/srmcons.c
@@
-289,7
+289,7
@@
srm_console_device(struct console *co, int *index)
return srmcons_driver;
}
-static int
__init
+static int
srm_console_setup(struct console *co, char *options)
{
return 0;