linux/arch/mips/powertv
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
..
asic mips: drop unused Kconfig symbols 2011-10-31 23:39:52 +01:00
pci mips: add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:30:57 -04:00
Kconfig mips: drop unused Kconfig symbols 2011-10-31 23:39:52 +01:00
Makefile mips: change to new flag variable 2011-03-17 14:02:56 +01:00
Platform MIPS: PowerTV: Migrate to new platform makefile style. 2010-08-05 13:25:52 +01:00
init.c MIPS: PowerTV: Simplify command line handling and needed config changes 2010-08-05 13:26:02 +01:00
init.h MIPS: PowerTV: simplify prom_init_cmdline() and merge into prom_init() 2010-01-12 18:19:33 +01:00
ioremap.c MIPS: PowerTV: Use O(1) algorthm for phys_to_dma/dma_to_phys 2010-08-05 13:25:40 +01:00
memory.c tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
powertv-clock.h MIPS: PowerTV: Base files for Cisco PowerTV platform 2009-12-17 01:57:17 +00:00
powertv-usb.c mips: add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:30:57 -04:00
powertv_setup.c MIPS: PowerTV: Removing dead CONFIG_DIAGNOSTICS 2010-08-05 13:26:01 +01:00
reset.c MIPS: PowerTV: Remove mips_machine_halt() 2010-01-12 18:19:32 +01:00
reset.h MIPS: PowerTV: Base files for Cisco PowerTV platform 2009-12-17 01:57:17 +00:00
time.c MIPS: PowerTV: Remove extra r4k_clockevent_init() call 2010-01-12 18:19:35 +01:00