original_kernel/arch/mips/pci
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
..
Makefile
fixup-bcm63xx.c
fixup-capcella.c
fixup-cobalt.c
fixup-emma2rh.c
fixup-fuloong2e.c
fixup-ip32.c
fixup-jmr3927.c
fixup-lemote2f.c
fixup-malta.c
fixup-mpc30x.c
fixup-pmcmsp.c
fixup-pnx8550.c
fixup-rbtx4927.c
fixup-rbtx4938.c
fixup-rc32434.c
fixup-sb1250.c
fixup-sni.c
fixup-tb0219.c
fixup-tb0226.c
fixup-tb0287.c
fixup-wrppmc.c
fixup-yosemite.c
msi-octeon.c
ops-bcm63xx.c
ops-bonito64.c
ops-bridge.c
ops-emma2rh.c
ops-gt64xxx_pci0.c
ops-lantiq.c
ops-loongson2.c
ops-mace.c
ops-msc.c
ops-nile4.c
ops-pmcmsp.c
ops-pnx8550.c
ops-rc32434.c
ops-sni.c
ops-titan-ht.c
ops-titan.c
ops-tx3927.c
ops-tx4927.c
ops-vr41xx.c
pci-alchemy.c
pci-bcm47xx.c
pci-bcm63xx.c
pci-bcm63xx.h
pci-bcm1480.c
pci-bcm1480ht.c
pci-emma2rh.c
pci-ip27.c mips: add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:30:57 -04:00
pci-ip32.c
pci-lantiq.c
pci-lantiq.h
pci-lasat.c
pci-octeon.c
pci-rc32434.c
pci-sb1250.c
pci-tx4927.c
pci-tx4938.c
pci-tx4939.c
pci-vr41xx.c
pci-vr41xx.h
pci-xlr.c
pci-yosemite.c
pci.c mips: add export.h to files using EXPORT_SYMBOL/THIS_MODULE 2011-10-31 19:30:57 -04:00
pcie-octeon.c