diff options
| author | Jiri Slaby <jirislaby@gmail.com> | 2007-05-08 09:31:45 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 20:15:14 +0200 |
| commit | cef2cf07273d12ac3453d2baff096423f17b7403 (patch) | |
| tree | 807ce95b91d1a09f449d61301f1148c85d7818db /Documentation/ioctl-number.txt | |
| parent | cpusets: allow empty {cpus,mems}_allowed to be set for unpopulated cpuset (diff) | |
| download | linux-cef2cf07273d12ac3453d2baff096423f17b7403.tar.xz linux-cef2cf07273d12ac3453d2baff096423f17b7403.zip | |
Misc: add sensable phantom driver
Add sensable phantom driver
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'Documentation/ioctl-number.txt')
| -rw-r--r-- | Documentation/ioctl-number.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt index 8f750c0efed5..3de7d379cf07 100644 --- a/Documentation/ioctl-number.txt +++ b/Documentation/ioctl-number.txt @@ -138,7 +138,8 @@ Code Seq# Include File Comments 'm' 00-1F net/irda/irmod.h conflict! 'n' 00-7F linux/ncp_fs.h 'n' E0-FF video/matrox.h matroxfb -'p' 00-3F linux/mc146818rtc.h +'p' 00-0F linux/phantom.h conflict! (OpenHaptics needs this) +'p' 00-3F linux/mc146818rtc.h conflict! 'p' 40-7F linux/nvram.h 'p' 80-9F user-space parport <mailto:tim@cyberelk.net> |