Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32aaeffb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 208bca08 67b84999

arch/alpha/kernel/core_irongate.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -303,6 +303,7 @@ irongate_init_arch(void) 
#include <linux/vmalloc.h>

#include <linux/vmalloc.h>

#include <linux/agp_backend.h>

#include <linux/agp_backend.h>

#include <linux/agpgart.h>

#include <linux/agpgart.h>

#include <linux/export.h>

#include <asm/pgalloc.h>

#include <asm/pgalloc.h>





#define GET_PAGE_DIR_OFF(addr) (addr >> 22)

#define GET_PAGE_DIR_OFF(addr) (addr >> 22)

arch/alpha/kernel/pci-sysfs.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */

 */





#include <linux/sched.h>

#include <linux/sched.h>

#include <linux/stat.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <linux/pci.h>

#include <linux/pci.h>

arch/alpha/kernel/pci_iommu.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/pci.h>

#include <linux/pci.h>

#include <linux/gfp.h>

#include <linux/gfp.h>

#include <linux/bootmem.h>

#include <linux/bootmem.h>

#include <linux/export.h>

#include <linux/scatterlist.h>

#include <linux/scatterlist.h>

#include <linux/log2.h>

#include <linux/log2.h>

#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

arch/alpha/kernel/setup.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ 
#include <asm/setup.h>

#include <asm/setup.h>

#include <asm/io.h>

#include <asm/io.h>

#include <linux/log2.h>

#include <linux/log2.h>

#include <linux/export.h>





extern struct atomic_notifier_head panic_notifier_list;

extern struct atomic_notifier_head panic_notifier_list;

static int alpha_panic_event(struct notifier_block *, unsigned long, void *);

static int alpha_panic_event(struct notifier_block *, unsigned long, void *);

arch/arm/common/it8152.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ 
#include <linux/ioport.h>

#include <linux/ioport.h>

#include <linux/irq.h>

#include <linux/irq.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/export.h>





#include <asm/mach/pci.h>

#include <asm/mach/pci.h>

#include <asm/hardware/it8152.h>

#include <asm/hardware/it8152.h>