diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-06 19:31:34 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-03-06 19:31:34 -0800 |
| commit | a0863130757f32df602c1c60326530c0152b626b (patch) | |
| tree | bdabe964054174309e1395905423efb07d0b6136 /arch/ia64/sn/kernel/io_common.c | |
| parent | b881502666783b2d9ca2fc7a056d0f773073a808 (diff) | |
| parent | 45e18c228e131592a922859e1525770a1803191d (diff) | |
| download | lwn-a0863130757f32df602c1c60326530c0152b626b.tar.gz lwn-a0863130757f32df602c1c60326530c0152b626b.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] kprobes arch consolidation build fix
[IA64] update efi region debugging to use MB, GB and TB as well as KB
[IA64] use dev_printk in video quirk
[IA64] remove remaining __FUNCTION__ occurrences
[IA64] remove unnecessary nfs includes from sys_ia32.c
[IA64] remove CONFIG_SMP ifdef in ia64_send_ipi()
[IA64] arch_ptrace() cleanup
[IA64] remove duplicate code from arch_ptrace()
[IA64] convert sys_ptrace to arch_ptrace
[IA64] remove find_thread_for_addr()
[IA64] do not sync RBS when changing PT_AR_BSP or PT_CFM
[IA64] access user RBS directly
Diffstat (limited to 'arch/ia64/sn/kernel/io_common.c')
| -rw-r--r-- | arch/ia64/sn/kernel/io_common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/io_common.c b/arch/ia64/sn/kernel/io_common.c index c4eb84f9e781..8a924a5661dd 100644 --- a/arch/ia64/sn/kernel/io_common.c +++ b/arch/ia64/sn/kernel/io_common.c @@ -364,7 +364,7 @@ void sn_bus_store_sysdata(struct pci_dev *dev) element = kzalloc(sizeof(struct sysdata_el), GFP_KERNEL); if (!element) { - dev_dbg(&dev->dev, "%s: out of memory!\n", __FUNCTION__); + dev_dbg(&dev->dev, "%s: out of memory!\n", __func__); return; } element->sysdata = SN_PCIDEV_INFO(dev); |