2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 11:44:01 +08:00
linux-next/drivers/clocksource
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
..
acpi_pm.c acpi_pm: Clear pmtmr_ioport if acpi_pm initialization fails 2011-01-21 17:38:19 +01:00
clksrc-dbx500-prcmu.c clocksource: fixup ux500 build problems 2011-10-03 09:34:16 +02:00
cs5535-clockevt.c Andres has moved 2010-07-20 16:25:41 -07:00
cyclone.c x86: Convert remaining x86 clocksources to clocksource_register_hz/khz 2011-02-21 13:33:33 -08:00
dw_apb_timer.c dw_apb_timer: constify clocksource name 2011-10-04 13:08:18 -07:00
i8253.c i8253: Create common clockevent implementation 2011-07-01 10:37:14 +02:00
Kconfig clocksource: add DBX500 PRCMU Timer support 2011-09-22 15:42:57 +02:00
Makefile clocksource: add DBX500 PRCMU Timer support 2011-09-22 15:42:57 +02:00
mmio.c clocksource: add common mmio clocksource 2011-05-23 18:04:51 +01:00
scx200_hrt.c clocksource: pass clocksource to read() callback 2009-04-21 13:41:47 -07:00
sh_cmt.c drivers/clocksource: Add module.h to those who were using it implicitly 2011-10-31 19:31:42 -04:00
sh_mtu2.c drivers/clocksource: Add module.h to those who were using it implicitly 2011-10-31 19:31:42 -04:00
sh_tmu.c drivers/clocksource: Add module.h to those who were using it implicitly 2011-10-31 19:31:42 -04:00
tcb_clksrc.c drivers/clocksource/tcb_clksrc.c: fix init sequence 2011-01-26 10:50:04 +10:00