diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-07-27 17:59:19 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-07-27 17:59:19 +0200 |
| commit | 800f65bba8d2030b3fef62850e203f9f176625a8 (patch) | |
| tree | 6507c4fe7a0826c253b4afb29375ab306a0fd9c8 /drivers/mtd/onenand/Kconfig | |
| parent | rt2x00: Fix regression for rt2500pci (diff) | |
| parent | Bluetooth: Support for Atheros AR300x serial chip (diff) | |
| download | linux-800f65bba8d2030b3fef62850e203f9f176625a8.tar.xz linux-800f65bba8d2030b3fef62850e203f9f176625a8.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-commands.h
Diffstat (limited to 'drivers/mtd/onenand/Kconfig')
| -rw-r--r-- | drivers/mtd/onenand/Kconfig | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/onenand/Kconfig index 3a9f15784600..9a49d68ba5f9 100644 --- a/drivers/mtd/onenand/Kconfig +++ b/drivers/mtd/onenand/Kconfig @@ -30,6 +30,13 @@ config MTD_ONENAND_OMAP2 Support for a OneNAND flash device connected to an OMAP2/OMAP3 CPU via the GPMC memory controller. +config MTD_ONENAND_SAMSUNG + tristate "OneNAND on Samsung SOC controller support" + depends on MTD_ONENAND && (ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210) + help + Support for a OneNAND flash device connected to an Samsung SOC + S3C64XX/S5PC1XX controller. + config MTD_ONENAND_OTP bool "OneNAND OTP Support" select HAVE_MTD_OTP |