diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 23:40:15 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-03-02 23:40:15 +0000 |
| commit | 882d01f96bc1909455696aae6eb7ce4df3e908c8 (patch) | |
| tree | 06e5789cb33d0547c2497fd4d0327dc9e8614d37 /arch/arm/plat-s5p/Kconfig | |
| parent | 64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39 (diff) | |
| parent | d608c738bb8fb37e5fbfcdef9c566764f2fea086 (diff) | |
| download | op-kernel-dev-882d01f96bc1909455696aae6eb7ce4df3e908c8.zip op-kernel-dev-882d01f96bc1909455696aae6eb7ce4df3e908c8.tar.gz | |
Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable
Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
Diffstat (limited to 'arch/arm/plat-s5p/Kconfig')
| -rw-r--r-- | arch/arm/plat-s5p/Kconfig | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/arch/arm/plat-s5p/Kconfig b/arch/arm/plat-s5p/Kconfig index e7c31e7..d400a6a 100644 --- a/arch/arm/plat-s5p/Kconfig +++ b/arch/arm/plat-s5p/Kconfig @@ -7,9 +7,8 @@ config PLAT_S5P bool - depends on ARCH_S5P6440 + depends on (ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210) default y - select PLAT_S3C select ARM_VIC select NO_IOPORT select ARCH_REQUIRE_GPIOLIB @@ -24,19 +23,3 @@ config PLAT_S5P select SAMSUNG_IRQ_UART help Base platform code for Samsung's S5P series SoC. - -if (PLAT_S5P && ARCH_S5P6440) - -# Configuration options shared by all S5P64XX implementations - -config CPU_S5P6440_INIT - bool - help - Initialisation code for the S5P6440. - -config CPU_S5P6440_CLOCK - bool - help - Clock support code for the S5P6440. - -endif |
