[staging-next 4/5] mei: update Documentation/ioctl/ioctl-number.txt

Tomas Winkler tomas.winkler at intel.com
Wed May 9 13:39:01 UTC 2012


Signed-off-by: Tomas Winkler <tomas.winkler at intel.com>
---
 Documentation/ioctl/ioctl-number.txt |    1 +
 Documentation/misc-devices/mei/TODO  |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index e34b531..915f28c 100644
--- 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
index 933b299..286fabf 100644
--- 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
-- 
1.7.4.4




More information about the devel mailing list