From d3e4fdc3dda724c263171826595e2fdcb54a8635 Mon Sep 17 00:00:00 2001
From: Kees Cook <keescook@chromium.org>
Date: Tue, 2 Oct 2012 11:17:51 -0700
Subject: [PATCH] --- yaml --- r: 353535 b: refs/heads/master c:
 a11ed37c0b9dcb49be6365c28a96aac78e785501 h: refs/heads/master i:   353533:
 4f66d396cdd48ffe5b1f7d92369a1916110bc706   353531:
 3aa353ae8a34c1e17397a7ac0fe31d5086c2800e   353527:
 734bca2fe0c4650a1903937887025668d603f922   353519:
 2f6f38bd2e5448a932e735a9be68d99d22064f0f   353503:
 33ec53c3b70fe066909c1a7e4e0b60f1951cfe1a   353471:
 cb8f75778e2c9f8d01ec853d8450c995ff12b592   353407:
 a731ec7c856bdcb1ac2a7a96bcf68a5b0d9b8ad3   353279:
 37b31e24393ea65462718172c4f719b05ddf33c9 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/mtd/devices/Kconfig | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4f1ee90ffffb..f71072cd631a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7b4dd55b89a26a2479b01fb214532e2fb1ed26ce
+refs/heads/master: a11ed37c0b9dcb49be6365c28a96aac78e785501
diff --git a/trunk/drivers/mtd/devices/Kconfig b/trunk/drivers/mtd/devices/Kconfig
index 27f80cd8aef3..c1873429e4eb 100644
--- a/trunk/drivers/mtd/devices/Kconfig
+++ b/trunk/drivers/mtd/devices/Kconfig
@@ -52,7 +52,7 @@ config MTD_MS02NV
 
 config MTD_DATAFLASH
 	tristate "Support for AT45xxx DataFlash"
-	depends on SPI_MASTER && EXPERIMENTAL
+	depends on SPI_MASTER
 	help
 	  This enables access to AT45xxx DataFlash chips, using SPI.
 	  Sometimes DataFlash chips are packaged inside MMC-format
@@ -81,7 +81,7 @@ config MTD_DATAFLASH_OTP
 
 config MTD_M25P80
 	tristate "Support most SPI Flash chips (AT26DF, M25P, W25X, ...)"
-	depends on SPI_MASTER && EXPERIMENTAL
+	depends on SPI_MASTER
 	help
 	  This enables access to most modern SPI flash chips, used for
 	  program and data storage.   Series supported include Atmel AT26DF,