diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 15:27:31 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 15:27:33 +1100 |
| commit | 518619f74df435d43ea476d5bdecbd1a5d113149 (patch) | |
| tree | 992ccb3a0626fdd1ff3ae6ec1068d0b7da8335e0 /arch/xtensa/configs/s6105_defconfig | |
| parent | d7eaf400f583154283e26244ee671585cd413156 (diff) | |
| parent | c6294af3fa2f5b352c2de9ff1086cb236796a54c (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/xtensa/configs/s6105_defconfig')
| -rw-r--r-- | arch/xtensa/configs/s6105_defconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/xtensa/configs/s6105_defconfig b/arch/xtensa/configs/s6105_defconfig index d929f77a0360..583c2b0974ca 100644 --- a/arch/xtensa/configs/s6105_defconfig +++ b/arch/xtensa/configs/s6105_defconfig @@ -11,7 +11,7 @@ CONFIG_GENERIC_FIND_NEXT_BIT=y CONFIG_GENERIC_HWEIGHT=y # CONFIG_ARCH_HAS_ILOG2_U32 is not set # CONFIG_ARCH_HAS_ILOG2_U64 is not set -CONFIG_NO_IOPORT=y +CONFIG_NO_IOPORT_MAP=y CONFIG_HZ=100 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" |