leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
b1618547bb
linux/arch/arm/mach-s3c24xx
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
..
include/mach Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
bast-ide.c ARM: S3C24XX: Use common macro to define resources on bast-ide.c 2012-05-12 16:12:20 +09:00
bast-irq.c
clock-s3c244x.c
clock-s3c2412.c
clock-s3c2416.c spi: s3c64xx: move controller information into driver data 2012-07-13 15:23:46 +09:00
clock-s3c2440.c ARM: S3C24XX: Correct AC97 clock control bit for S3C2440 2012-07-13 17:48:56 +09:00
clock-s3c2443.c spi: s3c64xx: move controller information into driver data 2012-07-13 15:23:46 +09:00
common-s3c2443.c spi: s3c64xx: move controller information into driver data 2012-07-13 15:23:46 +09:00
common-smdk.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
common.c ARM: S3C24XX: Remove duplicate header file inclusion 2012-06-20 09:19:17 +09:00
common.h
dma-s3c2410.c
dma-s3c2412.c
dma-s3c2440.c
dma-s3c2443.c ARM: S3C24XX: claim spi channels for hsspi in dma-s3c2443 2012-04-24 18:06:53 -07:00
h1940-bluetooth.c ARM: S3C24XX: Use module_platform_driver macro in h1940-bluetooth.c 2012-09-07 06:33:24 +09:00
irq-pm.c ARM: S3C24XX: move common power-management code to mach-s3c24xx 2012-05-12 16:22:18 +09:00
irq-s3c244x.c
irq-s3c2412.c
irq-s3c2416.c ARM: S3C24XX: add support for second irq set of S3C2416 2012-05-20 03:05:04 +09:00
irq-s3c2440.c
irq-s3c2443.c
Kconfig ARM: s3c24xx: use new PWM driver 2012-08-09 15:16:43 +02:00
mach-amlm5900.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-anubis.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
mach-at2440evb.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-bast.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-gta02.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-h1940.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-jive.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
mach-mini2440.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
mach-n30.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-nexcoder.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
mach-osiris-dvs.c ARM: S3C24XX: Use module_platform_driver macro in mach-osiris-dvs.c 2012-09-07 06:33:28 +09:00
mach-osiris.c Merge branch 'multiplatform/platform-data' into next/multiplatform 2012-09-22 01:07:21 -07:00
mach-otom.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-qt2410.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-rx1950.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-rx3715.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-smdk2410.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-smdk2413.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-smdk2416.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-smdk2440.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-smdk2443.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-tct_hammer.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-vr1000.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
mach-vstms.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
Makefile arm-soc: soc specific changes, part 2 2012-05-26 13:05:55 -07:00
Makefile.boot
pm-h1940.S
pm-s3c2410.c ARM: S3C24XX: Convert the PM code to gpiolib API 2012-07-13 18:05:00 +09:00
pm-s3c2412.c ARM: S3C24XX: Remove unused GPIO definitions for port J 2012-07-13 18:05:29 +09:00
pm-s3c2416.c
pm.c ARM: S3C24XX: move common power-management code to mach-s3c24xx 2012-05-12 16:22:18 +09:00
s3c244x.c ARM: S3C24XX: Remove unused GPIO definitions for port J 2012-07-13 18:05:29 +09:00
s3c2410.c
s3c2412.c ARM: S3C24XX: Remove unused GPIO definitions for port J 2012-07-13 18:05:29 +09:00
s3c2416.c ARM: S3C24XX: add support for second irq set of S3C2416 2012-05-20 03:05:04 +09:00
s3c2440.c
s3c2442.c
s3c2443.c
setup-i2c.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
setup-sdhci-gpio.c
setup-spi.c ARM: SAMSUNG: Remove pdev pointer parameter from spi gpio setup functions 2012-07-13 15:23:46 +09:00
setup-ts.c ARM: S3C24XX: Convert the touchscreen setup code to common GPIO API 2012-07-13 18:05:05 +09:00
simtec-audio.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
simtec-nor.c ARM: S3C24XX: Use common macro to define resources on simtec-nor.c 2012-05-12 16:12:25 +09:00
simtec-pm.c
simtec-usb.c ARM: samsung: move platform_data definitions 2012-09-19 17:42:18 +02:00
simtec.h
sleep-s3c2410.S
sleep-s3c2412.S
sleep.S ARM: S3C24XX: move common power-management code to mach-s3c24xx 2012-05-12 16:22:18 +09:00