mei: update Documentation/ioctl/ioctl-number.txt

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
mariux64 · May 9, 2012 · 4cd7a7e · 4cd7a7e
1 parent 5a44988
commit 4cd7a7e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
@@ -120,6 +120,7 @@ Code  Seq#(hex)	Include File		Comments
 'G'	00-0F	linux/gigaset_dev.h	conflict!
 'H'	00-7F	linux/hiddev.h		conflict!
 'H'	00-0F	linux/hidraw.h		conflict!
+'H'	01	linux/mei.h		conflict!
 'H'	00-0F	sound/asound.h		conflict!
 'H'	20-40	sound/asound_fm.h	conflict!
 'H'	80-8F	sound/sfnt_info.h	conflict!

diff --git a/Documentation/misc-devices/mei/TODO b/Documentation/misc-devices/mei/TODO
@@ -1,5 +1,4 @@
 TODO:
 	- Cleanup and split the timer function
 Upon Unstaging:
-	- Documentation/ioctl/ioctl-number.txt
 	- Updated MAINTAINERS