Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/arm/mach-iop13xx/pci.c b/arch/arm/mach-iop13xx/pci.c
index 99d94cb1bafd..7825c1aaa27b 100644
--- a/arch/arm/mach-iop13xx/pci.c
+++ b/arch/arm/mach-iop13xx/pci.c
@@ -94,13 +94,13 @@ void iop13xx_map_pci_memory(void)
                                         , 0, iop13xx_atux_mem_size, MT_DEVICE);
                                         if (!iop13xx_atux_mem_base) {
                                                 printk("%s: atux allocation "
-                                                       "failed\n", __FUNCTION__);
+                                                       "failed\n", __func__);
                                                 BUG();
                                         }
                                 } else
                                         iop13xx_atux_mem_size = 0;
                                 PRINTK("%s: atu: %d bus_size: %d mem_base: %x\n",
-                                __FUNCTION__, atu, iop13xx_atux_mem_size,
+                                __func__, atu, iop13xx_atux_mem_size,
                                 iop13xx_atux_mem_base);
                                 break;
                         case 1:
@@ -120,13 +120,13 @@ void iop13xx_map_pci_memory(void)
                                         , 0, iop13xx_atue_mem_size, MT_DEVICE);
                                         if (!iop13xx_atue_mem_base) {
                                                 printk("%s: atue allocation "
-                                                       "failed\n", __FUNCTION__);
+                                                       "failed\n", __func__);
                                                 BUG();
                                         }
                                 } else
                                         iop13xx_atue_mem_size = 0;
                                 PRINTK("%s: atu: %d bus_size: %d mem_base: %x\n",
-                                __FUNCTION__, atu, iop13xx_atue_mem_size,
+                                __func__, atu, iop13xx_atue_mem_size,
                                 iop13xx_atue_mem_base);
                                 break;
                         }