Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
ee766e4d07
linux/arch/arm/plat-samsung
History
Arnd Bergmann dffd7e35a5 Merge branch 'cleanup/gpio-header-removal' into next/soc 
* cleanup/gpio-header-removal:
  ARM: delete old reference to ARM_GPIOLIB_COMPLEX
  ARM: kill CONFIG_NEED_MACH_GPIO_H
  ARM: mach-s5p: get rid of all <mach/gpio.h> headers
  ARM: s5p: cut the custom ARCH_NR_GPIOS definition

This resolves a massive amount of conflicts between the
mach/gpio.h removal and the s5p platform removal.

Almost all changes are trivial, as both sides remove
stuff.

Conflicts:
	arch/arm/Kconfig
	arch/arm/mach-s5p64x0/common.c
	arch/arm/mach-s5p64x0/dev-audio.c
	arch/arm/mach-s5p64x0/include/mach/gpio-samsung.h
	arch/arm/mach-s5p64x0/mach-smdk6440.c
	arch/arm/mach-s5p64x0/mach-smdk6450.c
	arch/arm/mach-s5p64x0/setup-fb-24bpp.c
	arch/arm/mach-s5p64x0/setup-i2c0.c
	arch/arm/mach-s5p64x0/setup-i2c1.c
	arch/arm/mach-s5p64x0/setup-sdhci-gpio.c
	arch/arm/mach-s5p64x0/setup-spi.c
	arch/arm/mach-s5pc100/dev-audio.c
	arch/arm/mach-s5pc100/include/mach/gpio-samsung.h
	arch/arm/mach-s5pc100/mach-smdkc100.c
	arch/arm/mach-s5pc100/setup-fb-24bpp.c
	arch/arm/mach-s5pc100/setup-i2c0.c
	arch/arm/mach-s5pc100/setup-i2c1.c
	arch/arm/mach-s5pc100/setup-ide.c
	arch/arm/mach-s5pc100/setup-keypad.c
	arch/arm/mach-s5pc100/setup-sdhci-gpio.c
	arch/arm/mach-s5pc100/setup-spi.c
	arch/arm/mach-s5pv210/dev-audio.c
	arch/arm/mach-s5pv210/include/mach/gpio-samsung.h
	arch/arm/mach-s5pv210/mach-aquila.c
	arch/arm/mach-s5pv210/mach-goni.c
	arch/arm/mach-s5pv210/mach-smdkv210.c
	arch/arm/mach-s5pv210/setup-fb-24bpp.c
	arch/arm/mach-s5pv210/setup-fimc.c
	arch/arm/mach-s5pv210/setup-i2c0.c
	arch/arm/mach-s5pv210/setup-i2c1.c
	arch/arm/mach-s5pv210/setup-i2c2.c
	arch/arm/mach-s5pv210/setup-ide.c
	arch/arm/mach-s5pv210/setup-keypad.c
	arch/arm/mach-s5pv210/setup-sdhci-gpio.c
	arch/arm/mach-s5pv210/setup-spi.c
	arch/arm/plat-samsung/Kconfig
	arch/arm/plat-samsung/s5p-irq-eint.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2014-07-26 18:00:40 +02:00
..
include/plat Merge branch 'cleanup/gpio-header-removal' into next/soc 2014-07-26 18:00:40 +02:00
adc.c ARM: S5PC100: no more support S5PC100 SoC 2014-07-13 07:35:11 +09:00
cpu.c ARM: SAMSUNG: Remove remaining legacy code 2014-07-19 04:32:18 +09:00
dev-backlight.c ARM: SAMSUNG: remove GPIO flags in dev-backlight 2014-05-07 10:15:20 +02:00
dev-uart.c
devs.c ARM: SAMSUNG: Remove remaining legacy code 2014-07-19 04:32:18 +09:00
dma-ops.c ARM: s3c64xx: Add support for DMA using generic amba-pl08x driver 2013-11-24 14:38:24 +00:00
dma.c
init.c ARM: SAMSUNG: Remove legacy clock code 2014-07-19 04:24:59 +09:00
Kconfig Merge branch 'cleanup/gpio-header-removal' into next/soc 2014-07-26 18:00:40 +02:00
Makefile ARM: SAMSUNG: Remove remaining legacy code 2014-07-19 04:32:18 +09:00
platformdata.c ARM: SAMSUNG: remove all uses of clk_type member in sdhci platform data 2012-04-21 08:24:56 -07:00
pm-check.c ARM: SAMSUNG: Move s3c_pm_check_* prototypes to plat/pm-common.h 2014-03-21 04:09:26 +09:00
pm-common.c ARM: SAMSUNG: Move common save/restore helpers to separate file 2014-03-21 04:09:25 +09:00
pm-debug.c ARM: SAMSUNG: Move Samsung PM debug code into separate file 2014-03-21 04:09:16 +09:00
pm-gpio.c Merge branch 'cleanup/gpio-header-removal' into next/soc 2014-07-26 18:00:40 +02:00
pm.c Samsung PM related 2nd updates for v3.15 2014-03-29 02:02:56 +01:00
s3c-dma-ops.c ASoC: Samsung: Do not queue cyclic buffers multiple times 2013-08-29 17:31:02 +01:00
s5p-dev-mfc.c ARM: SAMSUNG: Remove remaining legacy code 2014-07-19 04:32:18 +09:00
setup-camif.c ARM: S3C[24|64]xx: move includes back under <mach/> scope 2014-01-14 15:24:06 +01:00
wakeup-mask.c driver-core: remove sysdev.h usage. 2011-12-21 16:26:03 -08:00
watchdog-reset.c ARM: SAMSUNG: Add watchdog reset driver 2013-06-19 03:13:16 +09:00