1
0
Fork 0
alistair23-linux/drivers/media/radio
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
..
si470x [media] si470x: fix compile warning 2011-09-06 14:46:38 -03:00
wl128x 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
Kconfig mfd: remove CONFIG_MFD_SUPPORT 2011-10-24 14:09:13 +02:00
Makefile [media] drivers/media: do not use EXTRA_CFLAGS 2011-09-03 18:50:59 -03:00
dsbr100.c [media] radio: Use the subsystem version control for VIDIOC_QUERYCAP 2011-07-27 17:53:16 -03:00
radio-aimslab.c [media] radio: Use the subsystem version control for VIDIOC_QUERYCAP 2011-07-27 17:53:16 -03:00
radio-aztech.c [media] radio: Use the subsystem version control for VIDIOC_QUERYCAP 2011-07-27 17:53:16 -03:00
radio-cadet.c [media] radio: Use the subsystem version control for VIDIOC_QUERYCAP 2011-07-27 17:53:16 -03:00
radio-gemtek.c [media] radio: Use the subsystem version control for VIDIOC_QUERYCAP 2011-07-27 17:53:16 -03:00
radio-maxiradio.c [media] radio: Use the subsystem version control for VIDIOC_QUERYCAP 2011-07-27 17:53:16 -03:00
radio-miropcm20.c [media] BKL: trivial BKL removal from V4L2 radio drivers 2010-12-01 20:10:05 -02:00
radio-mr800.c [media] radio: Use the subsystem version control for VIDIOC_QUERYCAP 2011-07-27 17:53:16 -03:00
radio-rtrack2.c [media] radio: Use the subsystem version control for VIDIOC_QUERYCAP 2011-07-27 17:53:16 -03:00
radio-sf16fmi.c [media] radio: Use the subsystem version control for VIDIOC_QUERYCAP 2011-07-27 17:53:16 -03:00
radio-sf16fmr2.c [media] radio-sf16fmr2: convert to generic TEA575x interface 2011-07-27 17:52:23 -03:00
radio-si4713.c [media] radio-si4713.c: fix compiler warning 2011-09-06 14:38:21 -03:00
radio-tea5764.c [media] media: tea5764: reconcile Kconfig symbol and macro 2011-11-03 18:33:54 -02:00
radio-terratec.c [media] radio: Use the subsystem version control for VIDIOC_QUERYCAP 2011-07-27 17:53:16 -03:00
radio-timb.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
radio-trust.c [media] radio: Use the subsystem version control for VIDIOC_QUERYCAP 2011-07-27 17:53:16 -03:00
radio-typhoon.c [media] radio: Use the subsystem version control for VIDIOC_QUERYCAP 2011-07-27 17:53:16 -03:00
radio-wl1273.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
radio-zoltrix.c [media] radio: Use the subsystem version control for VIDIOC_QUERYCAP 2011-07-27 17:53:16 -03:00
saa7706h.c [media] v4l: make sure drivers supply a zeroed struct v4l2_subdev 2011-04-29 12:33:28 -03:00
si4713-i2c.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
si4713-i2c.h [media] radio-si4713: Add regulator framework support 2010-12-29 08:16:35 -02:00
tef6862.c [media] v4l: make sure drivers supply a zeroed struct v4l2_subdev 2011-04-29 12:33:28 -03:00