diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 12:50:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-24 12:50:13 -0400 |
| commit | 76d21c563569bcea6bc67d65cc2c460cff643058 (patch) | |
| tree | 4dd2c9846ea7838077099646418978e354df1680 /Documentation/ioctl/ioctl-number.txt | |
| parent | 6e50e9f9f4a8277b4d76de417ca77cf3921bd524 (diff) | |
| parent | 472af2b05bdefcaee7e754e22cbf131110017ad6 (diff) | |
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (442 commits)
[media] videobuf2-dma-contig: make cookie() return a pointer to dma_addr_t
[media] sh_mobile_ceu_camera: Do not call vb2's mem_ops directly
[media] V4L: soc-camera: explicitly require V4L2_BUF_TYPE_VIDEO_CAPTURE
[media] v4l: soc-camera: Store negotiated buffer settings
[media] rc: interim support for 32-bit NEC-ish scancodes
[media] mceusb: topseed 0x0011 needs gen3 init for tx to work
[media] lirc_zilog: error out if buffer read bytes != chunk size
[media] lirc: silence some compile warnings
[media] hdpvr: use same polling interval as other OS
[media] ir-kbd-i2c: pass device code w/key in hauppauge case
[media] rc/keymaps: Remove the obsolete rc-rc5-tv keymap
[media] remove the old RC_MAP_HAUPPAUGE_NEW RC map
[media] rc/keymaps: Rename Hauppauge table as rc-hauppauge
[media] rc-rc5-hauppauge-new: Fix Hauppauge Grey mapping
[media] rc-rc5-hauppauge-new: Add support for the old Black RC
[media] rc-rc5-hauppauge-new: Add the old control to the table
[media] rc-winfast: Fix the keycode tables
[media] a800: Fix a few wrong IR key assignments
[media] opera1: Use multimedia keys instead of an app-specific mapping
[media] dw2102: Use multimedia keys instead of an app-specific mapping
...
Fix up trivial conflicts (remove/modify and some real conflicts) in:
arch/arm/mach-omap2/devices.c
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/dabusb/dabusb.c
drivers/staging/dabusb/dabusb.h
drivers/staging/easycap/easycap_ioctl.c
drivers/staging/usbvideo/usbvideo.c
drivers/staging/usbvideo/vicam.c
Diffstat (limited to 'Documentation/ioctl/ioctl-number.txt')
| -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 e68543f767d5..a0a5d82b6b0b 100644 --- a/Documentation/ioctl/ioctl-number.txt +++ b/Documentation/ioctl/ioctl-number.txt | |||
| @@ -273,6 +273,7 @@ Code Seq#(hex) Include File Comments | |||
| 273 | 'z' 40-7F CAN bus card conflict! | 273 | 'z' 40-7F CAN bus card conflict! |
| 274 | <mailto:oe@port.de> | 274 | <mailto:oe@port.de> |
| 275 | 'z' 10-4F drivers/s390/crypto/zcrypt_api.h conflict! | 275 | 'z' 10-4F drivers/s390/crypto/zcrypt_api.h conflict! |
| 276 | '|' 00-7F linux/media.h | ||
| 276 | 0x80 00-1F linux/fb.h | 277 | 0x80 00-1F linux/fb.h |
| 277 | 0x89 00-06 arch/x86/include/asm/sockios.h | 278 | 0x89 00-06 arch/x86/include/asm/sockios.h |
| 278 | 0x89 0B-DF linux/sockios.h | 279 | 0x89 0B-DF linux/sockios.h |