linux/arch/arm/mach-shmobile
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
..
include/mach ARM: mach-shmobile: sh73a0 and AG5EVM PINT support 2011-11-05 01:03:55 +09:00
board-ag5evm.c ARM: mach-shmobile: sh73a0 and AG5EVM PINT support 2011-11-05 01:03:55 +09:00
board-ap4evb.c Merge branch 'rmobile-latest' of git://github.com/pmundt/linux-sh 2011-11-06 17:28:13 -08:00
board-g3evm.c ARM: mach-shmobile: Setup consistent dma size at boot time 2011-08-22 12:00:12 +00:00
board-g4evm.c ARM: mach-shmobile: Setup consistent dma size at boot time 2011-08-22 12:00:12 +00:00
board-kota2.c ARM: mach-shmobile: Kota2 SDHI0 and SDHI1 support 2011-08-29 16:50:38 +09:00
board-mackerel.c Merge branch 'rmobile-latest' of git://github.com/pmundt/linux-sh 2011-11-06 17:28:13 -08:00
clock-sh73a0.c ARM: mach-shmobile: clock-sh73a0: tidyup CKSCR main clock selecter 2011-08-29 16:22:39 +09:00
clock-sh7367.c sh: move CLKDEV_xxx_ID macro to sh_clk.h 2011-07-11 15:07:25 +09:00
clock-sh7372.c Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x 2011-08-29 13:37:17 -07:00
clock-sh7377.c sh: move CLKDEV_xxx_ID macro to sh_clk.h 2011-07-11 15:07:25 +09:00
clock.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
console.c
cpuidle.c ARM: mach-shmobile: CPUIdle support 2011-05-25 11:19:23 +09:00
entry-gic.S ARM: mach-shmobile: update for GIC changes. 2011-01-07 12:02:11 +09:00
entry-intc.S ARM: gic: consolidate PPI handling 2011-10-23 13:32:29 +01:00
headsmp.S ARM: mach-shmobile: headsmp.S build fix 2011-05-24 12:29:14 +09:00
hotplug.c ARM: mach-shmobile: SMP base support 2010-12-14 18:15:44 +09:00
intc-sh73a0.c ARM: mach-shmobile: sh73a0 and AG5EVM PINT support 2011-11-05 01:03:55 +09:00
intc-sh7367.c ARM: mach-shmobile: Use common INTC IRQ code on sh7367 2011-11-05 01:01:50 +09:00
intc-sh7372.c ARM: mach-shmobile: Use common INTC IRQ code on sh7372 2011-11-05 01:02:51 +09:00
intc-sh7377.c ARM: mach-shmobile: Use common INTC IRQ code on sh7377 2011-11-05 01:01:50 +09:00
Kconfig ARM: mach-shmobile: ag5evm needs CONFIG_I2C 2011-11-05 01:21:47 +09:00
localtimer.c ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime 2011-02-23 17:54:27 +00:00
Makefile ARM: mach-shmobile: Kota2 SCIFA2 and SMSC911X support 2011-08-29 16:50:08 +09:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pfc-sh73a0.c ARM: mach-shmobile: Use common INTC IRQ code on sh73a0 2011-11-05 01:02:51 +09:00
pfc-sh7367.c
pfc-sh7372.c
pfc-sh7377.c
platsmp.c Merge branch 'rmobile/kota2' into rmobile-latest 2011-11-04 23:17:38 +09:00
pm_runtime.c PM: Move clock-related definitions and headers to separate file 2011-08-25 15:34:19 +02:00
pm-sh7372.c ARM: mach-shmobile: sh7372 A4R support (v4) 2011-10-22 00:20:12 +02:00
setup-sh73a0.c ARM: mach-shmobile: sh73a0 DMA Engine support for SY-DMAC 2011-05-25 11:36:51 +09:00
setup-sh7367.c ARM: mach-shmobile: Correct SCIF port types for SH7367. 2011-06-14 15:12:09 +09:00
setup-sh7372.c ARM: mach-shmobile: sh7372 A4R support (v4) 2011-10-22 00:20:12 +02:00
setup-sh7377.c ARM: mach-shmobile: sh7377 UIO platform data V3 2011-05-24 12:19:30 +09:00
sleep-sh7372.S ARM: mach-shmobile: sh7372 sleep warning fixes 2011-09-25 23:21:02 +02:00
smp-sh73a0.c ARM: shmobile: convert logical CPU numbers to physical numbers 2011-10-17 10:01:11 +01:00
suspend.c ARM: mach-shmobile: Suspend-to-RAM support 2011-05-25 11:19:17 +09:00
timer.c