commit 68c0e38cafa0f24866ec8605431f7f666cae1304
author Marc Zyngier <Marc.Zyngier@arm.com> Wed May 18 10:51:50 2011 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Fri May 20 22:27:08 2011 +0100
tree d989f4fd53af8664e2de581acee3a20b521808d9
parent b8b87aefef435e0f802d78d56804002cc439792b

ARM: 6907/1: Versatile: Use physmap driver instead of integrator-flash

Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: David Woodhouse <dwmw2@infradead.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

arch/arm/configs/versatile_defconfig

diff --git a/arch/arm/configs/versatile_defconfig b/arch/arm/configs/versatile_defconfig
index 0ce710f..cdd4d2b 100644
--- a/arch/arm/configs/versatile_defconfig
+++ b/arch/arm/configs/versatile_defconfig
@@ -32,7 +32,7 @@
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_CFI_INTELEXT=y
-CONFIG_MTD_ARM_INTEGRATOR=y
+CONFIG_MTD_PHYSMAP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_EEPROM_LEGACY=m
 CONFIG_NETDEVICES=y