Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...

[linux-2.6] / drivers / s390 / char / tape_34xx.c

diff --git a/drivers/s390/char/tape_34xx.c b/drivers/s390/char/tape_34xx.c
index 5b47e9cce75f6b277985ae9308692880722122a8..874adf365e467a4f9d1bce3c89bd27b718a54461 100644 (file)
--- a/drivers/s390/char/tape_34xx.c
+++ b/drivers/s390/char/tape_34xx.c
@@ -394,7 +394,7 @@ tape_34xx_unit_check(struct tape_device *device, struct tape_request *request,
                        return tape_34xx_erp_failed(request, -ENOSPC);
                default:
                        PRINT_ERR("Invalid op in %s:%i\n",
-                                 __FUNCTION__, __LINE__);
+                                 __func__, __LINE__);
                        return tape_34xx_erp_failed(request, 0);
                }
        }