1
linux/drivers/media/video/pvrusb2
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
..
Kconfig
Makefile [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
pvrusb2-audio.c
pvrusb2-audio.h
pvrusb2-context.c
pvrusb2-context.h
pvrusb2-cs53l32a.c
pvrusb2-cs53l32a.h
pvrusb2-ctrl.c
pvrusb2-ctrl.h
pvrusb2-cx2584x-v4l.c
pvrusb2-cx2584x-v4l.h
pvrusb2-debug.h
pvrusb2-debugifc.c
pvrusb2-debugifc.h
pvrusb2-devattr.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
pvrusb2-devattr.h
pvrusb2-dvb.c
pvrusb2-dvb.h
pvrusb2-eeprom.c
pvrusb2-eeprom.h
pvrusb2-encoder.c
pvrusb2-encoder.h
pvrusb2-fx2-cmd.h
pvrusb2-hdw-internal.h
pvrusb2-hdw.c 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
pvrusb2-hdw.h [media] pvrusb2: implement VIDIOC_QUERYSTD 2011-10-08 08:00:26 -03:00
pvrusb2-i2c-core.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
pvrusb2-i2c-core.h
pvrusb2-io.c
pvrusb2-io.h
pvrusb2-ioread.c
pvrusb2-ioread.h
pvrusb2-main.c [media] pvrusb2: Use LINUX_VERSION_CODE for VIDIOC_QUERYCAP 2011-07-27 17:53:15 -03:00
pvrusb2-std.c [media] pvrusb2: delete generic_standards_cnt 2011-05-20 09:28:25 -03:00
pvrusb2-std.h
pvrusb2-sysfs.c
pvrusb2-sysfs.h
pvrusb2-util.h
pvrusb2-v4l2.c 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
pvrusb2-v4l2.h
pvrusb2-video-v4l.c
pvrusb2-video-v4l.h
pvrusb2-wm8775.c
pvrusb2-wm8775.h
pvrusb2.h