Commit 473da2f0 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Jonathan Corbet

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: default avatarAlexandre Belloni <alexandre.belloni@bootlin.com>
Link: https://lore.kernel.org/r/20200209203304.66004-1-alexandre.belloni@bootlin.comSigned-off-by: default avatarJonathan Corbet <corbet@lwn.net>
parent 3b82a112
...@@ -266,7 +266,6 @@ Code Seq# Include File Comments ...@@ -266,7 +266,6 @@ Code Seq# Include File Comments
'o' 01-A1 `linux/dvb/*.h` DVB 'o' 01-A1 `linux/dvb/*.h` DVB
'p' 00-0F linux/phantom.h conflict! (OpenHaptics needs this) 'p' 00-0F linux/phantom.h conflict! (OpenHaptics needs this)
'p' 00-1F linux/rtc.h conflict! 'p' 00-1F linux/rtc.h conflict!
'p' 00-3F linux/mc146818rtc.h conflict!
'p' 40-7F linux/nvram.h 'p' 40-7F linux/nvram.h
'p' 80-9F linux/ppdev.h user-space parport 'p' 80-9F linux/ppdev.h user-space parport
<mailto:tim@cyberelk.net> <mailto:tim@cyberelk.net>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment