diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-14 12:24:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-14 12:24:00 -0400 |
| commit | 83bd6998b04fc1bb7280b14f16b2bdbdc07c914b (patch) | |
| tree | af1bbe2bac5752b69b1ac58bf5d822c735da439b /Documentation/ioctl-number.txt | |
| parent | e7250b8ae3870f37f660c2f65cafcaba85e3bfd3 (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into timers/hpet
Diffstat (limited to 'Documentation/ioctl-number.txt')
| -rw-r--r-- | Documentation/ioctl-number.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/Documentation/ioctl-number.txt b/Documentation/ioctl-number.txt index 3bb5f466a90d..1c6b545635a2 100644 --- a/Documentation/ioctl-number.txt +++ b/Documentation/ioctl-number.txt | |||
| @@ -105,7 +105,6 @@ Code Seq# Include File Comments | |||
| 105 | 'T' all linux/soundcard.h conflict! | 105 | 'T' all linux/soundcard.h conflict! |
| 106 | 'T' all asm-i386/ioctls.h conflict! | 106 | 'T' all asm-i386/ioctls.h conflict! |
| 107 | 'U' 00-EF linux/drivers/usb/usb.h | 107 | 'U' 00-EF linux/drivers/usb/usb.h |
| 108 | 'U' F0-FF drivers/usb/auerswald.c | ||
| 109 | 'V' all linux/vt.h | 108 | 'V' all linux/vt.h |
| 110 | 'W' 00-1F linux/watchdog.h conflict! | 109 | 'W' 00-1F linux/watchdog.h conflict! |
| 111 | 'W' 00-1F linux/wanrouter.h conflict! | 110 | 'W' 00-1F linux/wanrouter.h conflict! |