linux/arch/arm/mach-nomadik/include/mach
Olof Johansson e3a66aa33a Merge branch 'multiplatform/platform-data' into next/multiplatform
* multiplatform/platform-data:
  ARM: spear: move platform_data definitions
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions

Conflicts due to removed files:
	arch/arm/mach-tegra/board-harmony.c
	arch/arm/mach-tegra/board-trimslice.c

Conflicts due to code removal:
	arch/arm/mach-tegra/board-paz00.c

Context conflicts in:
	drivers/mmc/host/sdhci-tegra.c
	drivers/net/irda/pxaficp_ir.c

Signed-off-by: Olof Johansson <olof@lixom.net>
2012-09-22 01:07:21 -07:00
..
debug-macro.S ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
fsmc.h mtd: nand: driver for Nomadik 8815 SoC (on NHK8815 board) 2009-09-20 05:59:42 -07:00
hardware.h [ARM] 5590/1: Add basic support for ST Nomadik 8815 SoC and evaluation board 2009-07-02 21:20:44 +01:00
irqs.h ARM: nomadik: bump all IRQ numbers by one 2012-06-11 12:40:14 +02:00
timex.h [ARM] 5590/1: Add basic support for ST Nomadik 8815 SoC and evaluation board 2009-07-02 21:20:44 +01:00
uncompress.h [ARM] 5590/1: Add basic support for ST Nomadik 8815 SoC and evaluation board 2009-07-02 21:20:44 +01:00