summaryrefslogtreecommitdiffstats
path: root/arch/ia64/hp/sim/simeth.c
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-03-13 15:26:33 +1100
committerPaul Mackerras <paulus@samba.org>2008-03-13 15:26:33 +1100
commitbed04a4413376265746053be2a9cfbfc80c98ec9 (patch)
tree8f582294a655f70496cd08aedeb86de31dbad140 /arch/ia64/hp/sim/simeth.c
parente37c772e36a7943b2e0bd8f48312e78474c0df15 (diff)
parentc463be3520065ef8c05e3cbdf946c69604e91ceb (diff)
downloadblackbird-op-linux-bed04a4413376265746053be2a9cfbfc80c98ec9.tar.gz
blackbird-op-linux-bed04a4413376265746053be2a9cfbfc80c98ec9.zip
Merge branch 'linux-2.6'
Diffstat (limited to 'arch/ia64/hp/sim/simeth.c')
-rw-r--r--arch/ia64/hp/sim/simeth.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/hp/sim/simeth.c b/arch/ia64/hp/sim/simeth.c
index 9898febf609a..969fe9f443c4 100644
--- a/arch/ia64/hp/sim/simeth.c
+++ b/arch/ia64/hp/sim/simeth.c
@@ -222,7 +222,7 @@ simeth_probe1(void)
}
if ((rc = assign_irq_vector(AUTO_ASSIGN)) < 0)
- panic("%s: out of interrupt vectors!\n", __FUNCTION__);
+ panic("%s: out of interrupt vectors!\n", __func__);
dev->irq = rc;
/*
OpenPOWER on IntegriCloud