linux/arch/powerpc/platforms/83xx
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
..
asp834x.c powerpc/83xx: Move gianfar mdio nodes under the ethernet nodes 2009-03-24 08:35:04 -05:00
Kconfig gpio: move mpc8xxx/512x gpio driver to drivers/gpio 2011-09-23 00:14:15 +02:00
km83xx.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
Makefile powerpc/83xx: rename and update kmeter1 2011-03-15 10:06:37 -05:00
mcu_mpc8349emitx.c powerpc/83xx: Add shutdown request support to MCU handling on MPC8349 MITX 2011-11-03 13:12:30 -05:00
misc.c [POWERPC] 83xx: Don't call ioremap in the reset function 2007-01-26 00:37:11 -06:00
mpc83xx.h powerpc/mpc8308: fix USB DR controller initialization 2011-01-12 18:00:29 -06:00
mpc830x_rdb.c powerpc/83xx: fix build failures on dt compatible list. 2011-01-19 09:16:09 -07:00
mpc831x_rdb.c powerpc/83xx: fix build failures on dt compatible list. 2011-01-19 09:16:09 -07:00
mpc832x_mds.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
mpc832x_rdb.c powerpc: Fix build of some FSL platforms 2009-11-24 17:00:27 +11:00
mpc834x_itx.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
mpc834x_mds.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
mpc836x_mds.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
mpc836x_rdk.c powerpc/83xx: Fix few build errors with CONFIG_QUICC_ENGINE=n 2008-12-30 11:14:05 -06:00
mpc837x_mds.c arch/powerpc/platforms/83xx/mpc837x_mds.c: Add missing iounmap 2010-08-31 16:38:47 -05:00
mpc837x_rdb.c of/flattree: Add of_flat_dt_match() helper function 2011-01-01 13:03:25 -07:00
sbc834x.c atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
suspend-asm.S tree-wide: fix comment/printk typos 2010-11-01 15:38:34 -04:00
suspend.c powerpc: add export.h to files making use of EXPORT_SYMBOL 2011-10-31 19:30:37 -04:00
usb.c treewide: Convert uses of struct resource to resource_size(ptr) 2011-06-10 14:55:36 +02:00