diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-10-22 10:02:57 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-10-22 10:02:57 +0200 |
| commit | 861e66d3418a90f57b31a50110fc70b23569c551 (patch) | |
| tree | ffa0d5bf8dc3e4b82b88d8942390a11d827423f9 /Documentation | |
| parent | b55447a7301b12d509df4b2909ed38d125ad83d4 (diff) | |
| parent | b20be8de1b3972ccf9af72850b045214faa8d830 (diff) | |
| download | talos-op-linux-861e66d3418a90f57b31a50110fc70b23569c551.tar.gz talos-op-linux-861e66d3418a90f57b31a50110fc70b23569c551.zip | |
Merge branch 'dice-driver-playback-only' of git://git.alsa-project.org/alsa-kprivate into for-next
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/ioctl/ioctl-number.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt index 2a5f0e14efa3..7cbfa3c4fc3d 100644 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt @@ -138,6 +138,7 @@ Code Seq#(hex) Include File Comments 'H' C0-DF net/bluetooth/cmtp/cmtp.h conflict! 'H' C0-DF net/bluetooth/bnep/bnep.h conflict! 'H' F1 linux/hid-roccat.h <mailto:erazor_de@users.sourceforge.net> +'H' F8-FA sound/firewire.h 'I' all linux/isdn.h conflict! 'I' 00-0F drivers/isdn/divert/isdn_divert.h conflict! 'I' 40-4F linux/mISDNif.h conflict! |
