diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-02-15 04:24:31 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-02-15 04:24:31 -0500 |
| commit | 0a9d59a2461477bd9ed143c01af9df3f8f00fa81 (patch) | |
| tree | df997d1cfb0786427a0df1fbd6f0640fa4248cf4 /arch/xtensa/configs/s6105_defconfig | |
| parent | a23ce6da9677d245aa0aadc99f4197030350ab54 (diff) | |
| parent | 795abaf1e4e188c4171e3cd3dbb11a9fcacaf505 (diff) | |
Merge branch 'master' into for-next
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 5334f238f854..42b7feba71b7 100644 --- a/arch/xtensa/configs/s6105_defconfig +++ b/arch/xtensa/configs/s6105_defconfig | |||
| @@ -55,7 +55,7 @@ CONFIG_BLK_DEV_INITRD=y | |||
| 55 | CONFIG_INITRAMFS_SOURCE="" | 55 | CONFIG_INITRAMFS_SOURCE="" |
| 56 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 56 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
| 57 | CONFIG_SYSCTL=y | 57 | CONFIG_SYSCTL=y |
| 58 | CONFIG_EMBEDDED=y | 58 | CONFIG_EXPERT=y |
| 59 | CONFIG_SYSCTL_SYSCALL=y | 59 | CONFIG_SYSCTL_SYSCALL=y |
| 60 | CONFIG_KALLSYMS=y | 60 | CONFIG_KALLSYMS=y |
| 61 | # CONFIG_KALLSYMS_ALL is not set | 61 | # CONFIG_KALLSYMS_ALL is not set |