projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5a44988)
mei: update Documentation/ioctl/ioctl-number.txt
authorTomas Winkler <tomas.winkler@intel.com>
Wed, 9 May 2012 13:39:01 +0000 (16:39 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 9 May 2012 21:00:31 +0000 (14:00 -0700)
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Documentation/ioctl/ioctl-number.txt patch | blob | blame | history
Documentation/misc-devices/mei/TODO patch | blob | blame | history

diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index e34b531dc3161a18cc55fc591bd1db0e7c6991dd..915f28c470e94644f24ef842abb68ba7cbed97af 100644 (file)
--- 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 933b2999e19a64423794e4e7d180b39b54698fa0..286fabf733770366c25f78390a98fc80aa9b656d 100644 (file)
--- 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