From: Dong Aisheng Date: Thu, 12 Sep 2019 07:32:22 +0000 (+0800) Subject: dma: dma-buf.h: change DMA_BUF_IOCTL_PHYS NR to 10 X-Git-Tag: rel_imx_4.19.35_1.1.0~52 X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=a51dda8feec03e8c675230786d64ee050944dbfd;p=linux.git dma: dma-buf.h: change DMA_BUF_IOCTL_PHYS NR to 10 Change DMA_BUF_IOCTL_PHYS NR to 10 avoid conflicts with upstream in the future. Reviewed-by: Song Bing Signed-off-by: Dong Aisheng (cherry picked from commit 36abba8f55078424e037e7f7877e9f22062cccbc) --- diff --git a/include/uapi/linux/dma-buf.h b/include/uapi/linux/dma-buf.h index 514beecd2d13..62dcde71ccc4 100644 --- a/include/uapi/linux/dma-buf.h +++ b/include/uapi/linux/dma-buf.h @@ -41,6 +41,6 @@ struct dma_buf_phys { #define DMA_BUF_BASE 'b' #define DMA_BUF_IOCTL_SYNC _IOW(DMA_BUF_BASE, 0, struct dma_buf_sync) -#define DMA_BUF_IOCTL_PHYS _IOW(DMA_BUF_BASE, 1, struct dma_buf_phys) +#define DMA_BUF_IOCTL_PHYS _IOW(DMA_BUF_BASE, 10, struct dma_buf_phys) #endif