diff options
| author | Alexandre Belloni <alexandre.belloni@bootlin.com> | 2020-02-09 21:33:04 +0100 |
|---|---|---|
| committer | Jonathan Corbet <corbet@lwn.net> | 2020-02-13 11:42:02 -0700 |
| commit | 473da2f0d80aa7240dd0a2be5015fdfd93543ca2 (patch) | |
| tree | fb6fda9906df2f641d0f0f2fa55dba383640ca65 /Documentation/userspace-api/ioctl | |
| parent | 3b82a112ce594889742164b242d8f213938a443f (diff) | |
docs: userspace: ioctl-number: remove mc146818rtc conflict
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@bootlin.com>
Link: https://lore.kernel.org/r/20200209203304.66004-1-alexandre.belloni@bootlin.com
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'Documentation/userspace-api/ioctl')
| -rw-r--r-- | Documentation/userspace-api/ioctl/ioctl-number.rst | 1 |
1 files changed, 0 insertions, 1 deletions
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@cyberelk.net> |