Merge commit 'v2.6.27-rc7' into x86/pebs

[linux-2.6-omap-h63xx.git] / sound / isa / sb / sb_common.c

diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c
index 176193c05101007dae7b8c08d086da1632c7168f..b432d9ae874baba6b52d837b8886eff2dd02fc22 100644 (file)
--- a/sound/isa/sb/sb_common.c
+++ b/sound/isa/sb/sb_common.c
@@ -20,7 +20,6 @@
  *
  */
 
-#include <sound/driver.h>
 #include <linux/delay.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
@@ -52,7 +51,7 @@ int snd_sbdsp_command(struct snd_sb *chip, unsigned char val)
                        outb(val, SBP(chip, COMMAND));
                        return 1;
                }
-       snd_printd("%s [0x%lx]: timeout (0x%x)\n", __FUNCTION__, chip->port, val);
+       snd_printd("%s [0x%lx]: timeout (0x%x)\n", __func__, chip->port, val);
        return 0;
 }
 
@@ -69,7 +68,7 @@ int snd_sbdsp_get_byte(struct snd_sb *chip)
                        return val;
                }
        }
-       snd_printd("%s [0x%lx]: timeout\n", __FUNCTION__, chip->port);
+       snd_printd("%s [0x%lx]: timeout\n", __func__, chip->port);
        return -ENODEV;
 }
 
@@ -88,7 +87,7 @@ int snd_sbdsp_reset(struct snd_sb *chip)
                        else
                                break;
                }
-       snd_printdd("%s [0x%lx] failed...\n", __FUNCTION__, chip->port);
+       snd_printdd("%s [0x%lx] failed...\n", __func__, chip->port);
        return -ENODEV;
 }