diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2012-05-09 09:39:01 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-09 17:00:31 -0400 |
commit | 4cd7a7e72e929cfe29c247293957848bc6874720 (patch) | |
tree | f847511e756c8f3f589a882722d075702582a8aa /Documentation | |
parent | 5a44988207ee16b96e5445b8e95ab9881ce310cc (diff) |
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>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/ioctl/ioctl-number.txt | 1 | ||||
-rw-r--r-- | 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 e34b531dc31..915f28c470e 100644 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt | |||
@@ -120,6 +120,7 @@ Code Seq#(hex) Include File Comments | |||
120 | 'G' 00-0F linux/gigaset_dev.h conflict! | 120 | 'G' 00-0F linux/gigaset_dev.h conflict! |
121 | 'H' 00-7F linux/hiddev.h conflict! | 121 | 'H' 00-7F linux/hiddev.h conflict! |
122 | 'H' 00-0F linux/hidraw.h conflict! | 122 | 'H' 00-0F linux/hidraw.h conflict! |
123 | 'H' 01 linux/mei.h conflict! | ||
123 | 'H' 00-0F sound/asound.h conflict! | 124 | 'H' 00-0F sound/asound.h conflict! |
124 | 'H' 20-40 sound/asound_fm.h conflict! | 125 | 'H' 20-40 sound/asound_fm.h conflict! |
125 | 'H' 80-8F sound/sfnt_info.h conflict! | 126 | 'H' 80-8F sound/sfnt_info.h conflict! |
diff --git a/Documentation/misc-devices/mei/TODO b/Documentation/misc-devices/mei/TODO index 933b2999e19..286fabf7337 100644 --- a/Documentation/misc-devices/mei/TODO +++ b/Documentation/misc-devices/mei/TODO | |||
@@ -1,5 +1,4 @@ | |||
1 | TODO: | 1 | TODO: |
2 | - Cleanup and split the timer function | 2 | - Cleanup and split the timer function |
3 | Upon Unstaging: | 3 | Upon Unstaging: |
4 | - Documentation/ioctl/ioctl-number.txt | ||
5 | - Updated MAINTAINERS | 4 | - Updated MAINTAINERS |