1
linux/arch/arm/mach-s5pc100/include/mach
Ben Dooks 459f2a3202 ARM: S5PC100: Fixup cross tree merge problems
The commit 45c79433c0 got things building
but then commit 17d2f877ae8b68b09bf88a9949ee64fbbda5ee10 and others
where merged in from a seperate tree and this has resulted from a build
failure due to the redefinition of IRQ_EINT().

Fix this by merging a new commit.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
2010-05-26 19:09:50 +09:00
..
debug-macro.S ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework 2010-05-20 15:28:32 +09:00
dma.h ARM: S5PC100: DMA: Add platform devices for PL330 DMACs 2010-05-23 16:26:56 +01:00
entry-macro.S ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework 2010-05-20 15:28:32 +09:00
gpio.h ARM: S5PC100: use common plat-s5p external interrupt code 2010-05-20 15:28:44 +09:00
hardware.h ARM: S5PC100: Kconfigs and Makefiles 2009-08-16 23:35:19 +01:00
io.h ARM: SAMSUNG: Move plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx 2010-02-24 01:52:06 +00:00
irqs.h ARM: S5P: Fix the platform external interrupt issues. 2010-05-26 19:09:50 +09:00
map.h ARM: S5PC100: Fixup merge problems 2010-05-23 16:27:04 +01:00
memory.h
pwm-clock.h ARM: S5PC100: IRQ and timer 2009-08-16 23:25:00 +01:00
regs-clock.h ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework 2010-05-20 15:28:32 +09:00
regs-fb.h ARM: S5PC1xx: add platform helpers for s3c-fb device 2009-12-01 01:33:16 +00:00
regs-gpio.h ARM: S5PC100: Fixup cross tree merge problems 2010-05-26 19:09:50 +09:00
regs-irq.h ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework 2010-05-20 15:28:32 +09:00
spi-clocks.h ARM: S5PC100: Define SPI platform devices 2010-05-20 19:31:09 +09:00
system.h ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework 2010-05-20 15:28:32 +09:00
tick.h ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework 2010-05-20 15:28:32 +09:00
timex.h ARM: SAMSUNG: Move plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx 2010-02-24 01:52:06 +00:00
uncompress.h
vmalloc.h Merge branch 'origin' into devel-stable 2010-03-08 20:21:04 +00:00