leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
e3a66aa33a
linux/arch/arm/mach-mmp/include/mach
History
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
..
addr-map.h ARM: mmp: move XX_REG definition to addr-map.h 2012-05-07 11:34:38 +08:00
cputype.h ARM: mmp: fix cpuid detection on mmp2 2010-11-03 23:11:16 +08: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
devices.h ARM: mmp: add usb device support for PXA910 2012-05-03 15:05:10 +08:00
dma.h [ARM] pxa: add base support for Marvell's PXA168 processor line 2009-03-23 10:11:34 +08:00
entry-macro.S ARM: mmp: support DT in irq 2012-05-05 16:35:13 +08:00
gpio.h ARM: pxa: change gpio to platform device 2011-11-15 19:08:27 +08:00
hardware.h [ARM] pxa: add base support for Marvell's PXA168 processor line 2009-03-23 10:11:34 +08:00
irqs.h ARM: mmp: support DT in irq 2012-05-05 16:35:13 +08:00
mfp-mmp2.h ARM: mmp: MMP2 drive strength FAST using wrong value 2011-01-15 04:29:19 -06:00
mfp-pxa168.h ARM: pxa168/gplugd: get rid of mfp-gplugd.h 2011-08-11 10:10:43 +08:00
mfp-pxa910.h ARM: mmp: PXA910 drive strength FAST using wrong value 2011-01-15 04:29:20 -06:00
mfp.h [ARM] pxa: fix the incorrectly defined drive strength macros for pxa{168,910} 2009-05-22 18:15:31 +08:00
mmp2.h ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
pm-mmp2.h ARM: mmp: add PM support for mmp2 2012-05-07 11:35:00 +08:00
pm-pxa910.h ARM: mmp: add pm support for pxa910 2012-05-07 11:48:37 +08:00
pxa168.h ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
pxa910.h ARM: pxa: move platform_data definitions 2012-09-14 11:18:10 +02:00
regs-apbc.h ARM: mmp: remove unused definition in APBC and APMU 2012-09-08 23:40:09 +08:00
regs-apmu.h ARM: mmp: remove unused definition in APBC and APMU 2012-09-08 23:40:09 +08:00
regs-icu.h [ARM] mmp2: add missing ICU register definitions 2010-03-02 07:40:57 +08:00
regs-rtc.h ARM: mmp: enable rtc in pxa910 2012-02-28 11:23:09 +08:00
regs-smc.h [ARM] mmp: add smc registers definition 2010-05-11 17:25:06 +02:00
regs-timers.h [ARM] pxa: add base support for Marvell's PXA168 processor line 2009-03-23 10:11:34 +08:00
regs-usb.h ARM: mmp: add usb device support for PXA910 2012-05-03 15:05:10 +08:00
teton_bga.h ARM: pxa168: added support for Teton BGA platform 2010-10-09 17:07:26 +08:00
timex.h [ARM] mmp: fix clock tick rate in mmp2 2010-05-11 17:25:05 +02:00
uncompress.h ARM: zImage: remove the static qualifier from global data variables 2011-05-07 00:08:02 -04:00