linux/arch/powerpc/platforms/embedded6xx
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
..
c2k.c powerpc: Remove default kexec/crash_kernel ops assignments 2008-12-23 15:13:28 +11:00
flipper-pic.c powerpc: Remove trival irq_host_ops.unmap 2011-05-19 15:31:39 +10:00
flipper-pic.h powerpc: gamecube/wii: flipper interrupt controller support 2009-12-12 22:24:28 -07:00
gamecube.c powerpc/kexec: Remove empty ppc_md.machine_kexec_prepare 2011-01-21 14:08:36 +11:00
hlwd-pic.c powerpc: Remove trival irq_host_ops.unmap 2011-05-19 15:31:39 +10:00
hlwd-pic.h powerpc: wii: hollywood interrupt controller support 2009-12-12 22:24:30 -07:00
holly.c powerpc: Fix up modules that should be including module.h 2011-10-31 19:30:38 -04:00
Kconfig powerpc: drop unused Kconfig symbols 2011-10-31 23:39:52 +01:00
linkstation.c powerpc: fix linkstation and storcenter compilation breakage 2009-03-09 11:10:58 -05:00
ls_uart.c [POWERPC] 82xx and embedded6xx: Use machine_*_initcall() hooks in platform code 2008-01-28 08:30:41 -06:00
Makefile powerpc: wii: platform support 2009-12-12 22:24:30 -07:00
mpc10x.h
mpc7448_hpc2.c powerpc: Fix up modules that should be including module.h 2011-10-31 19:30:38 -04:00
prpmc2800.c powerpc: Remove default kexec/crash_kernel ops assignments 2008-12-23 15:13:28 +11:00
storcenter.c treewide: typo 'interrrupt' word corrections. 2011-09-15 14:13:02 +02:00
usbgecko_udbg.c powerpc/gamecube/wii: Fix off-by-one error in ugecon/usbgecko_udbg 2009-12-18 15:13:57 +11:00
usbgecko_udbg.h powerpc: gamecube/wii: early debugging using usbgecko 2009-12-12 22:24:31 -07:00
wii.c powerpc/kexec: Remove empty ppc_md.machine_kexec_prepare 2011-01-21 14:08:36 +11:00