2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 22:24:09 +08:00
linux-next/drivers/media/rc
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
..
keymaps 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
ati_remote.c [media] ati_remote: add support for SnapStream Firefly remote 2011-09-22 10:54:40 -03:00
ene_ir.c [media] ene_ir: Use current logging styles 2011-09-03 20:57:09 -03:00
ene_ir.h [media] ene_ir: Use current logging styles 2011-09-03 20:57:09 -03:00
fintek-cir.c [media] fintek-cir: make suspend with active IR more reliable 2011-06-11 09:03:35 -03:00
fintek-cir.h [media] fintek-cir: new driver for Fintek LPC SuperIO CIR function 2011-05-25 20:07:58 -03:00
imon.c [media] imon: don't parse scancodes until intf configured 2011-09-21 14:48:15 -03:00
ir-jvc-decoder.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
ir-lirc-codec.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
ir-mce_kbd-decoder.c [media] ir-mce_kbd-decoder: include module.h for its facilities 2011-07-29 12:54:38 -03:00
ir-nec-decoder.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
ir-raw.c drivers/media: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required 2011-10-31 19:31:51 -04:00
ir-rc5-decoder.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
ir-rc5-sz-decoder.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
ir-rc6-decoder.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
ir-sony-decoder.c drivers/media: Add module.h to all files using it implicitly 2011-10-31 19:31:51 -04:00
ite-cir.c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6 2011-07-30 00:08:53 -07:00
ite-cir.h [media] ite-cir: 8709 needs to use pnp resource 2 2011-07-01 16:31:38 -03:00
Kconfig [media] ati_remote: update Kconfig description 2011-09-22 10:55:10 -03:00
lirc_dev.c [media] lirc_dev: store cdev in irctl, up maxdevs 2011-06-11 09:03:20 -03:00
Makefile [media] move ati_remote driver from input/misc to media/rc 2011-09-22 10:47:41 -03:00
mceusb.c [media] mceusb: update version, copyright, author 2011-08-27 08:57:01 -03:00
nuvoton-cir.c [media] nuvoton-cir: simplify raw IR sample handling 2011-09-11 09:33:40 -03:00
nuvoton-cir.h [media] nuvoton-cir: simplify raw IR sample handling 2011-09-11 09:33:40 -03:00
rc-core-priv.h [media] media, rc: Use static inline functions to kill warnings 2011-09-23 23:50:52 -03:00
rc-loopback.c [media] rc-core: lirc use unsigned int 2011-07-27 17:52:59 -03:00
rc-main.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
redrat3.c [media] redrat3: remove unused dev struct members 2011-09-03 10:58:26 -03:00
streamzap.c [media] rc/streamzap: fix reporting response times 2011-01-31 12:22:13 -02:00
winbond-cir.c [media] winbond-cir: Use current logging styles 2011-09-03 20:58:05 -03:00