summaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/sys_sio.c
diff options
context:
space:
mode:
authorIgor Mammedov <niallain@gmail.com>2008-04-29 01:08:21 +0200
committerSteve French <sfrench@us.ibm.com>2008-04-29 01:08:21 +0200
commite9f20d6f03e8df393b001dab6dc5226c2a5daf57 (patch)
tree73e94fa5e4f83576c97e36187b809c5aad2ade30 /arch/alpha/kernel/sys_sio.c
parent[CIFS] fixed compatibility issue with samba refferal request (diff)
parentMerge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff)
downloadlinux-e9f20d6f03e8df393b001dab6dc5226c2a5daf57.tar.xz
linux-e9f20d6f03e8df393b001dab6dc5226c2a5daf57.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/alpha/kernel/sys_sio.c')
-rw-r--r--arch/alpha/kernel/sys_sio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_sio.c b/arch/alpha/kernel/sys_sio.c
index ee7b9009ebb4..d4327e461c22 100644
--- a/arch/alpha/kernel/sys_sio.c
+++ b/arch/alpha/kernel/sys_sio.c
@@ -89,7 +89,7 @@ sio_pci_route(void)
/* First, ALWAYS read and print the original setting. */
pci_bus_read_config_dword(pci_isa_hose->bus, PCI_DEVFN(7, 0), 0x60,
&orig_route_tab);
- printk("%s: PIRQ original 0x%x new 0x%x\n", __FUNCTION__,
+ printk("%s: PIRQ original 0x%x new 0x%x\n", __func__,
orig_route_tab, alpha_mv.sys.sio.route_tab);
#if defined(ALPHA_RESTORE_SRM_SETUP)