git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
sparc64
/
kernel
/
starfire.c
diff --git
a/arch/sparc64/kernel/starfire.c
b/arch/sparc64/kernel/starfire.c
index
ae859d4
..
b930fee
100644
(file)
--- a/
arch/sparc64/kernel/starfire.c
+++ b/
arch/sparc64/kernel/starfire.c
@@
-54,7
+54,7
@@
struct starfire_irqinfo {
static struct starfire_irqinfo *sflist = NULL;
/* Beam me up Scott(McNeil)y... */
static struct starfire_irqinfo *sflist = NULL;
/* Beam me up Scott(McNeil)y... */
-void
*
starfire_hookup(int upaid)
+void starfire_hookup(int upaid)
{
struct starfire_irqinfo *p;
unsigned long treg_base, hwmid, i;
{
struct starfire_irqinfo *p;
unsigned long treg_base, hwmid, i;
@@
-81,8
+81,6
@@
void *starfire_hookup(int upaid)
p->upaid = upaid;
p->next = sflist;
sflist = p;
p->upaid = upaid;
p->next = sflist;
sflist = p;
-
- return (void *) p;
}
unsigned int starfire_translate(unsigned long imap,
}
unsigned int starfire_translate(unsigned long imap,