Re: [PATCH] docs: userspace: ioctl-number: remove mc146818rtc conflict

[Jonathan Corbet]

On Sun,  9 Feb 2020 21:33:04 +0100
Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx> wrote:

> In 2.3.43pre2, the RTC ioctls definitions were actually moved from
> linux/mc146818rtc.h to linux/rtc.h
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx>
> ---
>  Documentation/userspace-api/ioctl/ioctl-number.rst | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/Documentation/userspace-api/ioctl/ioctl-number.rst b/Documentation/userspace-api/ioctl/ioctl-number.rst
> index 2e91370dc159..f759edafd938 100644
> --- a/Documentation/userspace-api/ioctl/ioctl-number.rst
> +++ b/Documentation/userspace-api/ioctl/ioctl-number.rst
> @@ -266,7 +266,6 @@ Code  Seq#    Include File                                           Comments
>  'o'   01-A1  `linux/dvb/*.h`                                         DVB
>  'p'   00-0F  linux/phantom.h                                         conflict! (OpenHaptics needs this)
>  'p'   00-1F  linux/rtc.h                                             conflict!
> -'p'   00-3F  linux/mc146818rtc.h                                     conflict!
>  'p'   40-7F  linux/nvram.h
>  'p'   80-9F  linux/ppdev.h                                           user-space parport
>                                                                       <mailto:tim@xxxxxxxxxxxx>

Applied, thanks.

jon