summaryrefslogtreecommitdiff
path: root/arch/cris
diff options
context:
space:
mode:
Diffstat (limited to 'arch/cris')
-rw-r--r--arch/cris/defconfig1
-rw-r--r--arch/cris/etraxfs_defconfig1
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/cris/defconfig b/arch/cris/defconfig
index ec857c6acbb7..59f36a58f842 100644
--- 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"
diff --git a/arch/cris/etraxfs_defconfig b/arch/cris/etraxfs_defconfig
index 808d911c4479..73c646a37255 100644
--- a/arch/cris/etraxfs_defconfig
+++ b/arch/cris/etraxfs_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"