Merge tag 'compat-ioctl-5.5' of git://git.kernel.org:/pub/scm/linux/kernel/git/arnd...

[linux-2.6-block.git] / drivers / dma-buf / dma-buf.c

diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c
index d377b4ca66bfa61ea92706c74614e8cccac52242..ce41cd9b758ac8fbaf22bc5c145ad9d93aac58f4 100644 (file)
--- a/drivers/dma-buf/dma-buf.c
+++ b/drivers/dma-buf/dma-buf.c
@@ -415,9 +415,7 @@ static const struct file_operations dma_buf_fops = {
        .llseek         = dma_buf_llseek,
        .poll           = dma_buf_poll,
        .unlocked_ioctl = dma_buf_ioctl,
-#ifdef CONFIG_COMPAT
-       .compat_ioctl   = dma_buf_ioctl,
-#endif
+       .compat_ioctl   = compat_ptr_ioctl,
        .show_fdinfo    = dma_buf_show_fdinfo,
 };