Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

[net-next-2.6.git] / Documentation / ioctl / ioctl-number.txt

diff --git a/Documentation/ioctl/ioctl-number.txt b/Documentation/ioctl/ioctl-number.txt
index 10f5af8b73f71c76b7b7f495296b0640b6affa73..63ffd78824d8f63ce7c6d1d38fccf9d7b8f9720b 100644 (file)
--- a/Documentation/ioctl/ioctl-number.txt
+++ b/Documentation/ioctl/ioctl-number.txt
@@ -259,7 +259,7 @@ Code  Seq#(hex)     Include File            Comments
 't'    00-7F   linux/if_ppp.h
 't'    80-8F   linux/isdn_ppp.h
 't'    90      linux/toshiba.h
-'u'    00-1F   linux/smb_fs.h
+'u'    00-1F   linux/smb_fs.h          gone
 'v'    all     linux/videodev.h        conflict!
 'v'    00-1F   linux/ext2_fs.h         conflict!
 'v'    00-1F   linux/fs.h              conflict!