OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7bcd5b4671
linux/arch/arm/mach-s5pv210/include/mach
History
Arnd Bergmann a07613a54d Merge branch 'samsung/dt' into samsung/cleanup 
Conflicts:
	arch/arm/mach-s3c64xx/Makefile
	arch/arm/mach-s5pc100/Makefile
	arch/arm/mach-s5pv210/Makefile

Pull in previously resolved conflicts:

The Makefiles were reorganized in the "rmk/restart" series and modified
in the "samsung/cleanup series". This also pulls in the other conflict
resolutions from the restart series against the samsung/dt series.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-09 16:01:00 +00: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
dma.h ARM: S5PV210: Use generic DMA PL330 driver 2011-09-14 11:10:02 +05:30
entry-macro.S ARM: samsung: convert to MULTI_IRQ_HANDLER 2011-11-15 18:14:04 +00:00
gpio.h ARM: gpio: make trivial GPIOLIB implementation the default 2011-08-12 08:54:19 +01:00
hardware.h ARM: S5PV210: Add Samsung S5PV210 CPU support 2010-02-24 22:47:21 +00:00
io.h ARM: S5PV210: Add Samsung S5PV210 CPU support 2010-02-24 22:47:21 +00:00
irqs.h ARM: SAMSUNG: Move timer irq numbers to end of linux irq space 2011-12-23 10:04:39 +09:00
map.h ARM: S5PV210: Modified files for SPI consolidation work 2011-12-23 10:50:03 +09:00
memory.h ARM: mach-s5pv210: Setup consistent dma size at boot time 2011-08-22 12:00:11 +00:00
pm-core.h ARM: SAMSUNG: Update the name of regarding Samsung GPIO 2011-09-21 15:07:04 +09:00
regs-audss.h ARM: SAMSUNG: Add platform device for idma 2011-07-21 14:12:19 +09:00
regs-clock.h ARM: S5P: add support for tv device 2011-10-04 18:58:26 +09:00
regs-gpio.h ARM: S5P: Unify defines for both gpio interrupt types 2010-10-21 07:54:57 +09:00
regs-irq.h ARM: S5PV210: Add IRQ support 2010-02-24 22:47:22 +00:00
regs-sys.h ARM: S5PV210: Enable USB HSOTG gadget build 2010-10-21 07:54:56 +09:00
spi-clocks.h ARM: S5PV210: Define SPI platform devices 2010-05-20 19:31:10 +09:00
system.h ARM: restart: remove the now empty arch_reset() 2012-01-05 12:57:22 +00:00
tick.h ARM: S5PV210: Add clock support for S5PV210 2010-02-24 22:47:22 +00:00
timex.h ARM: S5PV210: Add Samsung S5PV210 CPU support 2010-02-24 22:47:21 +00:00
uncompress.h ARM: S5PV210: Add Samsung S5PV210 CPU support 2010-02-24 22:47:21 +00:00