6 files changed, 8 insertions, 11 deletions

diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c
index 0055a6c06f75..04c69ffbea71 100644
--- a/arch/m68k/atari/stram.c
+++ b/arch/m68k/atari/stram.c
@@ -29,7 +29,6 @@
 #include <asm/atarihw.h>
 #include <asm/atari_stram.h>
 #include <asm/io.h>
-#include <asm/semaphore.h>
 
 #undef DEBUG
 
diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c
index 2b412454cb41..ded7dd2f67b2 100644
--- a/arch/m68k/kernel/ints.c
+++ b/arch/m68k/kernel/ints.c
@@ -186,7 +186,7 @@ int setup_irq(unsigned int irq, struct irq_node *node)
 
         if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
                 printk("%s: Incorrect IRQ %d from %s\n",
-                       __FUNCTION__, irq, node->devname);
+                       __func__, irq, node->devname);
                 return -ENXIO;
         }
 
@@ -249,7 +249,7 @@ void free_irq(unsigned int irq, void *dev_id)
         unsigned long flags;
 
         if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
-                printk("%s: Incorrect IRQ %d\n", __FUNCTION__, irq);
+                printk("%s: Incorrect IRQ %d\n", __func__, irq);
                 return;
         }
 
@@ -267,7 +267,7 @@ void free_irq(unsigned int irq, void *dev_id)
                 node->handler = NULL;
         } else
                 printk("%s: Removing probably wrong IRQ %d\n",
-                       __FUNCTION__, irq);
+                       __func__, irq);
 
         if (!irq_list[irq]) {
                 if (contr->shutdown)
@@ -288,7 +288,7 @@ void enable_irq(unsigned int irq)
 
         if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
                 printk("%s: Incorrect IRQ %d\n",
-                       __FUNCTION__, irq);
+                       __func__, irq);
                 return;
         }
 
@@ -312,7 +312,7 @@ void disable_irq(unsigned int irq)
 
         if (irq >= NR_IRQS || !(contr = irq_controller[irq])) {
                 printk("%s: Incorrect IRQ %d\n",
-                       __FUNCTION__, irq);
+                       __func__, irq);
                 return;
         }
 
diff --git a/arch/m68k/mac/oss.c b/arch/m68k/mac/oss.c
index 50603d3dce84..3c943d2ec570 100644
--- a/arch/m68k/mac/oss.c
+++ b/arch/m68k/mac/oss.c
@@ -190,7 +190,7 @@ void oss_irq_enable(int irq) {
                         break;
 #ifdef DEBUG_IRQUSE
                 default:
-                        printk("%s unknown irq %d\n",__FUNCTION__, irq);
+                        printk("%s unknown irq %d\n", __func__, irq);
                         break;
 #endif
         }
@@ -230,7 +230,7 @@ void oss_irq_disable(int irq) {
                         break;
 #ifdef DEBUG_IRQUSE
                 default:
-                        printk("%s unknown irq %d\n", __FUNCTION__, irq);
+                        printk("%s unknown irq %d\n", __func__, irq);
                         break;
 #endif
         }
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index f42caa79e4e8..a2bb01f59642 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -79,7 +79,6 @@ void show_mem(void)
 
         printk("\nMem-info:\n");
         show_free_areas();
-        printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
         for_each_online_pgdat(pgdat) {
                 for (i = 0; i < pgdat->node_spanned_pages; i++) {
                         struct page *page = pgdat->node_mem_map + i;
diff --git a/arch/m68k/q40/q40ints.c b/arch/m68k/q40/q40ints.c
index 46161cef08b9..9f0e3d59bf92 100644
--- a/arch/m68k/q40/q40ints.c
+++ b/arch/m68k/q40/q40ints.c
@@ -47,7 +47,7 @@ static int q40_irq_startup(unsigned int irq)
         switch (irq) {
         case 1: case 2: case 8: case 9:
         case 11: case 12: case 13:
-                printk("%s: ISA IRQ %d not implemented by HW\n", __FUNCTION__, irq);
+                printk("%s: ISA IRQ %d not implemented by HW\n", __func__, irq);
                 return -ENXIO;
         }
         return 0;
diff --git a/arch/m68k/sun3/intersil.c b/arch/m68k/sun3/intersil.c
index db359d7402a6..0116d208d300 100644
--- a/arch/m68k/sun3/intersil.c
+++ b/arch/m68k/sun3/intersil.c
@@ -15,7 +15,6 @@
 
 #include <asm/errno.h>
 #include <asm/system.h>
-#include <asm/semaphore.h>
 #include <asm/rtc.h>
 #include <asm/intersil.h>