Merge branch 'linus' into sched/devel

[linux-2.6-omap-h63xx.git] / drivers / char / pcmcia / cm4000_cs.c

diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index 454d7324ba40b19ef3ce1396b3f09dfb0aeaff9e..4a933d4134231cd095a859f286a0d8c7e08e434e 100644 (file)
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -53,7 +53,7 @@ module_param(pc_debug, int, 0600);
 #define DEBUGP(n, rdr, x, args...) do {                                \
        if (pc_debug >= (n))                                            \
                dev_printk(KERN_DEBUG, reader_to_dev(rdr), "%s:" x,     \
-                          __FUNCTION__ , ## args);                     \
+                          __func__ , ## args);                 \
        } while (0)
 #else
 #define DEBUGP(n, rdr, x, args...)