summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPhilippe Langlais <philippe.langlais@linaro.org>2011-06-16 17:09:54 +0200
committersaid m bagheri <ebgheri@steludxu2848.(none)>2011-06-17 13:42:17 +0200
commit8c9c68f77509b92384ae6f41f60232d6af832aeb (patch)
treee6092278600eab9b63ab71ded4473efc05f6c197 /arch
parentc5890e7b63ef8a29496ac423c1f5e11e271eb309 (diff)
ARM: ux500: flash: put driver code into staging
Signed-off-by: Rajat Verma <rajat.verma@stericsson.com> Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com> Conflicts: arch/arm/configs/u8500_defconfig
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/u8500_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/u8500_defconfig b/arch/arm/configs/u8500_defconfig
index 9c4bed4f4a8..4fbb7e4d6dc 100644
--- a/arch/arm/configs/u8500_defconfig
+++ b/arch/arm/configs/u8500_defconfig
@@ -220,6 +220,7 @@ CONFIG_STE_DMA40=y
CONFIG_STAGING=y
CONFIG_U8500_MMIO=y
CONFIG_U8500_CM=y
+CONFIG_U8500_FLASH=y
# CONFIG_STAGING_EXCLUDE_BUILD is not set
CONFIG_AUTOFS_FS=m
CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4=y