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

..

include/mach

ARM: S5PC100: Fixup cross tree merge problems

2010-05-26 19:09:50 +09:00

clock.c

ARM: S5PC100: Pre-requisite clock patch for plat-s5pc1xx to plat-s5p move

2010-05-19 18:22:47 +09:00

cpu.c

ARM: S5PC100: Fixup merge problems

2010-05-23 16:27:04 +01:00

dev-audio.c

ARM: S5PC100: Add audio platform devices

2010-05-20 19:27:40 +09:00

dev-spi.c

ARM: S5PC100: Define SPI platform devices

2010-05-20 19:31:09 +09:00

dma.c

ARM: S5PC100: Fixup merge problems

2010-05-23 16:27:04 +01:00

gpiolib.c

ARM: S5PC100: use common plat-s5p external interrupt code

2010-05-20 15:28:44 +09:00

init.c

ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework

2010-05-20 15:28:32 +09:00

irq-gpio.c

ARM: S5PC100: Add support for gpio interrupt

2010-05-20 15:28:43 +09:00

Kconfig

ARM: S5PC100: DMA: Add platform devices for PL330 DMACs

2010-05-23 16:26:56 +01:00

mach-smdkc100.c

ARM: Merge for-2635-4/s5p-devs

2010-05-20 19:38:30 +09:00

Makefile

ARM: S5PC100: DMA: Add platform devices for PL330 DMACs

2010-05-23 16:26:56 +01:00

Makefile.boot

ARM: S5PC100: Kconfigs and Makefiles

2009-08-16 23:35:19 +01:00

setup-fb-24bpp.c

ARM: S5PC100: Move frame buffer helpers from plat-s5pc1xx to mach-s5pc100

2010-05-19 18:23:27 +09:00

setup-i2c0.c

ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100

2010-05-19 18:23:37 +09:00

setup-i2c1.c

ARM: S5PC100: Move i2c helpers from plat-s5pc1xx to mach-s5pc100

2010-05-19 18:23:37 +09:00

setup-sdhci-gpio.c

ARM: S5PC100: Move sdhci helpers from plat-s5pc1xx to mach-s5pc100

2010-05-20 15:28:08 +09:00

setup-sdhci.c

Fix misspelling of "successful" and variants in comments.

2010-02-05 12:22:30 +01:00