Merge branch 'core/xen' into x86/urgent

[linux-2.6-omap-h63xx.git] / drivers / staging / comedi / drivers.c

diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c
index 06372b227bb2d965348e42c691599196592c537a..36a93b95e3f24027c55cb01d2dd8da5b641dd0cb 100644 (file)
--- a/drivers/staging/comedi/drivers.c
+++ b/drivers/staging/comedi/drivers.c
@@ -557,7 +557,7 @@ unsigned int comedi_buf_munge(comedi_async * async, unsigned int num_bytes)
                block_size = num_bytes - count;
                if (block_size < 0) {
                        rt_printk("%s: %s: bug! block_size is negative\n",
-                               __FILE__, __FUNCTION__);
+                               __FILE__, __func__);
                        break;
                }
                if ((int)(async->munge_ptr + block_size -