summaryrefslogtreecommitdiff
path: root/extra/Configs/Config.sparc
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2010-11-28 21:09:47 +0100
committerCarmelo Amoroso <carmelo.amoroso@st.com>2010-11-28 21:09:47 +0100
commit57f6cce72c889f2e7b342e87a565a064320a6ee2 (patch)
tree5466406472918d3adb63398f5fb9ea1511a5e73f /extra/Configs/Config.sparc
parent4ec89b87bc0eea8d9ca6b50564d12eeb3b1b0119 (diff)
parent5dea871ac73ef4608022c058b50adc946917f9b9 (diff)
Merge commit 'origin/master' into prelink
Conflicts: ldso/include/dl-hash.h Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'extra/Configs/Config.sparc')
-rw-r--r--extra/Configs/Config.sparc1
1 files changed, 0 insertions, 1 deletions
diff --git a/extra/Configs/Config.sparc b/extra/Configs/Config.sparc
index abb4d7874..dd8949039 100644
--- a/extra/Configs/Config.sparc
+++ b/extra/Configs/Config.sparc
@@ -23,7 +23,6 @@ choice
SPARC v7 will give you only static support.
config CONFIG_SPARC_V7
- select ARCH_HAS_NO_SHARED
bool "SPARC v7"
config CONFIG_SPARC_V8