Message ID | 20210313112241.366786-1-zhang.yunkai@zte.com.cn (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | lightnvm: remove duplicate include in lightnvm.h | expand |
On 13/03/2021 12.22, menglong8.dong@gmail.com wrote: > From: Zhang Yunkai <zhang.yunkai@zte.com.cn> > > 'linux/ioctl.h' included in 'lightnvm.h' is duplicated. > It is also included in the 33th line. > > Signed-off-by: Zhang Yunkai <zhang.yunkai@zte.com.cn> > --- > include/uapi/linux/lightnvm.h | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/include/uapi/linux/lightnvm.h b/include/uapi/linux/lightnvm.h > index ead2e72e5c88..2745afd9b8fa 100644 > --- a/include/uapi/linux/lightnvm.h > +++ b/include/uapi/linux/lightnvm.h > @@ -22,7 +22,6 @@ > > #ifdef __KERNEL__ > #include <linux/const.h> > -#include <linux/ioctl.h> > #else /* __KERNEL__ */ > #include <stdio.h> > #include <sys/ioctl.h> Thanks, Yunkai. I've pulled it. Note that I've merged your two patches into one.
diff --git a/include/uapi/linux/lightnvm.h b/include/uapi/linux/lightnvm.h index ead2e72e5c88..2745afd9b8fa 100644 --- a/include/uapi/linux/lightnvm.h +++ b/include/uapi/linux/lightnvm.h @@ -22,7 +22,6 @@ #ifdef __KERNEL__ #include <linux/const.h> -#include <linux/ioctl.h> #else /* __KERNEL__ */ #include <stdio.h> #include <sys/ioctl.h>