Merge branch 'for-linus' of git://www.jni.nu/cris

[linux-2.6] / arch / cris / defconfig

diff --git a/arch/cris/defconfig b/arch/cris/defconfig
index ec857c6acbb7a43a94f465bfe4a8b98534212673..59f36a58f8420a0f17050da1873c3b1711fd4487 100644 (file)
--- a/arch/cris/defconfig
+++ b/arch/cris/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"