diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 17:32:47 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-15 17:32:47 +0100 |
| commit | 9ced9f03d12d7539e86b0bff5bc750153c976c34 (patch) | |
| tree | dcb8a23b0245d3d4d2719d7ea987f7eee608c553 /drivers/mtd | |
| parent | Merge branch 'davinci-next-2' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | ARM: EXYNOS4: Implement Clock gating for System MMU (diff) | |
| download | linux-9ced9f03d12d7539e86b0bff5bc750153c976c34.tar.xz linux-9ced9f03d12d7539e86b0bff5bc750153c976c34.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts:
arch/arm/mm/Kconfig
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/onenand/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/onenand/Kconfig index 4dbd0f58eebf..4f426195f8db 100644 --- a/drivers/mtd/onenand/Kconfig +++ b/drivers/mtd/onenand/Kconfig @@ -32,7 +32,7 @@ config MTD_ONENAND_OMAP2 config MTD_ONENAND_SAMSUNG tristate "OneNAND on Samsung SOC controller support" - depends on ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_S5PV310 + depends on ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210 || ARCH_EXYNOS4 help Support for a OneNAND flash device connected to an Samsung SOC. S3C64XX/S5PC100 use command mapping method. |