diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2012-05-09 16:39:01 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-05-09 14:00:31 -0700 |
| commit | 4cd7a7e72e929cfe29c247293957848bc6874720 (patch) | |
| tree | f847511e756c8f3f589a882722d075702582a8aa | |
| parent | 5a44988207ee16b96e5445b8e95ab9881ce310cc (diff) | |
| download | linux-next-4cd7a7e72e929cfe29c247293957848bc6874720.tar.gz | |
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>
| -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 e34b531dc316..915f28c470e9 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 933b2999e19a..286fabf73377 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 |