linux/drivers/media/video/usbvision
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
usbvision-cards.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
usbvision-cards.h [media] usbvision: add Nogatech USB MicroCam 2011-05-20 09:29:29 -03:00
usbvision-core.c [media] usbvision: remove broken testpattern 2011-05-20 09:29:31 -03:00
usbvision-i2c.c [media] usbvision: add Nogatech USB MicroCam 2011-05-20 09:29:29 -03:00
usbvision-video.c [media] Stop using linux/version.h on most video drivers 2011-07-27 17:53:12 -03:00
usbvision.h [media] usbvision: add Nogatech USB MicroCam 2011-05-20 09:29:29 -03:00