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>

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>
4cd7a7e7 · Tomas Winkler · Greg Kroah-Hartman · 5a449882 · 4cd7a7e7 · 4cd7a7e7
Commit 4cd7a7e7 authored May 09, 2012 by Tomas Winkler Committed by Greg Kroah-Hartman May 09, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

Documentation/ioctl/ioctl-number.txt Documentation/ioctl/ioctl-number.txt +1 -0

Documentation/misc-devices/mei/TODO Documentation/misc-devices/mei/TODO +0 -1

No files found.
--- 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!

--- a/Documentation/misc-devices/mei/TODO
+++ b/Documentation/misc-devices/mei/TODO
 TODO:
 	- Cleanup and split the timer function
 Upon Unstaging:
-	- Documentation/ioctl/ioctl-number.txt
 	- Updated MAINTAINERS