Merge branch 'r8169-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...

[linux-2.6] / arch / cris / artpec_3_defconfig

diff --git a/arch/cris/artpec_3_defconfig b/arch/cris/artpec_3_defconfig
index 55c90a4e6960f6e24cabca4982b73668c42c7609..41fe67409aab3d51778e1febed000d4a4f3da945 100644 (file)
--- a/arch/cris/artpec_3_defconfig
+++ b/arch/cris/artpec_3_defconfig
@@ -13,7 +13,6 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_NO_IOPORT=y
-CONFIG_NO_IOMEM=y
 CONFIG_FORCE_MAX_ZONEORDER=6
 CONFIG_CRIS=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"