linux/include/media
Linus Torvalds 32aaeffbd4 Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
  Revert "tracing: Include module.h in define_trace.h"
  irq: don't put module.h into irq.h for tracking irqgen modules.
  bluetooth: macroize two small inlines to avoid module.h
  ip_vs.h: fix implicit use of module_get/module_put from module.h
  nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
  include: replace linux/module.h with "struct module" wherever possible
  include: convert various register fcns to macros to avoid include chaining
  crypto.h: remove unused crypto_tfm_alg_modname() inline
  uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
  pm_runtime.h: explicitly requires notifier.h
  linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
  miscdevice.h: fix up implicit use of lists and types
  stop_machine.h: fix implicit use of smp.h for smp_processor_id
  of: fix implicit use of errno.h in include/linux/of.h
  of_platform.h: delete needless include <linux/module.h>
  acpi: remove module.h include from platform/aclinux.h
  miscdevice.h: delete unnecessary inclusion of module.h
  device_cgroup.h: delete needless include <linux/module.h>
  net: sch_generic remove redundant use of <linux/module.h>
  net: inet_timewait_sock doesnt need <linux/module.h>
  ...

Fix up trivial conflicts (other header files, and  removal of the ab3550 mfd driver) in
 - drivers/media/dvb/frontends/dibx000_common.c
 - drivers/media/video/{mt9m111.c,ov6650.c}
 - drivers/mfd/ab3550-core.c
 - include/linux/dmaengine.h
2011-11-06 19:44:47 -08:00
..
davinci [media] davinci vpbe: VENC( Video Encoder) implementation 2011-07-27 17:53:10 -03:00
adp1653.h [media] adp1653: Add driver for LED flash controller 2011-07-27 17:55:39 -03:00
adv7343.h
ak881x.h
atmel-isi.h [media] V4L: at91: add Atmel Image Sensor Interface (ISI) support 2011-07-27 17:53:23 -03:00
bt819.h
cs53l32a.h
cs5345.h
cx2341x.h
cx25840.h
i2c-addr.h
ir-kbd-i2c.h
lirc_dev.h [media] lirc_dev: store cdev in irctl, up maxdevs 2011-06-11 09:03:20 -03:00
lirc.h
m5mols.h [media] m5mols: Remove superfluous irq field from the platform data struct 2011-09-24 00:23:03 -03:00
m52790.h
media-device.h
media-devnode.h
media-entity.h
mmp-camera.h [media] marvell-cam: Basic working MMP camera driver 2011-07-27 17:53:01 -03:00
msp3400.h
mt9p031.h [media] mt9p031: Aptina (Micron) MT9P031 5MP sensor driver 2011-09-11 09:49:28 -03:00
mt9t001.h [media] mt9t001: Aptina (Micron) MT9T001 3MP sensor driver 2011-09-21 15:31:08 -03:00
mt9t112.h
mt9v011.h
mt9v032.h [media] v4l: Add mt9v032 sensor driver 2011-05-20 09:29:49 -03:00
noon010pc30.h
omap1_camera.h
omap3isp.h [media] omap3isp: Move platform data definitions from isp.h to media/omap3isp.h 2011-09-11 09:49:27 -03:00
ov772x.h [media] V4L: ov772x: remove superfluous soc-camera client operations 2011-11-03 18:28:05 -02:00
ov7670.h [media] marvell-cam: Move cafe-ccic into its own directory 2011-07-27 17:53:00 -03:00
pwc-ioctl.h Remove unneeded version.h includes from include/ 2011-09-15 14:57:06 +02:00
radio-si4713.h
rc-core.h [media] rc-core.h: Surround macro with do {} while (0) 2011-09-03 20:56:22 -03:00
rc-map.h [media] ati_remote: add support for SnapStream Firefly remote 2011-09-22 10:54:40 -03:00
rj54n1cb0c.h
s5k6aa.h [media] v4l: Add v4l2 subdev driver for S5K6AAFX sensor 2011-11-03 18:29:11 -02:00
s5p_fimc.h [media] s5p-fimc: Convert to use generic media bus polarity flags 2011-09-24 00:22:31 -03:00
saa6588.h
saa6752hs.h
saa7115.h
saa7127.h
saa7146_vv.h
saa7146.h Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
sh_mobile_ceu.h [media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier 2011-07-27 17:56:08 -03:00
sh_mobile_csi2.h [media] V4L: sh_mobile_csi2: switch away from using the soc-camera bus notifier 2011-07-27 17:56:08 -03:00
sh_vou.h
si4713.h
soc_camera_platform.h [media] V4L: soc_camera_platform: remove superfluous soc-camera client operations 2011-11-03 18:28:12 -02:00
soc_camera.h [media] V4L: soc-camera: make (almost) all client drivers re-usable outside of the framework 2011-11-03 18:29:03 -02:00
soc_mediabus.h [media] V4L: soc-camera: add helper functions for new bus configuration type 2011-11-03 18:27:13 -02:00
sr030pc30.h
timb_radio.h [media] radio-timb: Simplified platform data 2011-07-27 17:53:07 -03:00
timb_video.h
tuner-types.h
tuner.h [media] dib0700: add initial code for PCTV 340e by Davide Ferri 2011-07-27 17:52:25 -03:00
tvaudio.h
tveeprom.h
tvp514x.h
tvp5150.h
tvp7002.h
tw9910.h
upd64031a.h
upd64083.h
v4l2-chip-ident.h [media] noon010pc30: Remove g_chip_ident operation handler 2011-09-21 14:31:34 -03:00
v4l2-common.h
v4l2-ctrls.h [media] v4l2-ctrls: implement new volatile autocluster scheme 2011-09-21 10:48:30 -03:00
v4l2-dev.h [media] v4l: Fix media_entity_to_video_device macro argument name 2011-06-01 09:42:03 -03:00
v4l2-device.h
v4l2-event.h [media] v4l2-event.h: add overview documentation to the header 2011-07-27 17:53:34 -03:00
v4l2-fh.h [media] v4l2-event/ctrls/fh: allocate events per fh and per type instead of just per-fh 2011-07-27 17:53:31 -03:00
v4l2-int-device.h include: replace linux/module.h with "struct module" wherever possible 2011-10-31 19:32:32 -04:00
v4l2-ioctl.h [media] V4L: add two new ioctl()s for multi-size videobuffer management 2011-11-03 18:28:24 -02:00
v4l2-mediabus.h [media] v4l2: Add polarity flag definitions for the parallel bus FIELD signal 2011-09-24 00:21:31 -03:00
v4l2-mem2mem.h
v4l2-subdev.h [media] V4L: add .g_std() core V4L2 subdevice operation 2011-11-03 18:29:02 -02:00
videobuf2-core.h [media] vb2: add vb2_get_unmapped_area in vb2 core 2011-11-03 18:29:13 -02:00
videobuf2-dma-contig.h [media] media: vb2: dma contig allocator: use dma_addr instread of paddr 2011-09-06 15:05:10 -03:00
videobuf2-dma-sg.h
videobuf2-memops.h
videobuf2-vmalloc.h
videobuf-core.h
videobuf-dma-contig.h
videobuf-dma-sg.h doc: fix broken references 2011-09-27 18:08:04 +02:00
videobuf-dvb.h [media] Add missing include guard to header file 2011-05-25 21:42:30 -03:00
videobuf-vmalloc.h
wm8775.h