kernel: Update to 3.11.6.

[people/amarx/ipfire-3.x.git] / kernel / scripts / configure

diff --git a/kernel/scripts/configure b/kernel/scripts/configure
index 6ed0bd4122ae6e42a6b7a5691b8579eedefa6f95..c691ce03436e4deb4818b55fe631e47a174f21ac 100755 (executable)
--- a/kernel/scripts/configure
+++ b/kernel/scripts/configure
@@ -14,7 +14,7 @@ CONFIGS="x86_64:default"
 CONFIGS="${CONFIGS} i686:legacy i686:default"
 
 # armv7hl
-CONFIGS="${CONFIGS} armv7hl:exynos armv7hl:default"
+CONFIGS="${CONFIGS} armv7hl:default"
 
 # armv5tel
 CONFIGS="${CONFIGS} armv5tel:versatile armv5tel:kirkwood"
@@ -76,10 +76,6 @@ function merge_config() {
                armv7hl:default)
                        configs="${configs} config-arm-generic config-armv7hl-default"
                        ;;
-               armv7hl:exynos)
-                       configs="${configs} config-arm-generic config-armv7hl-default"
-                       configs="${configs} config-armv7hl-exynos"
-                       ;;
                *)
                        echo >&2 "ERROR: Invalid parameters given: $@"
                        return 1
@@ -252,11 +248,6 @@ function diff_configs() {
                                ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-i686-default \
                                        ${filename} > ${filename}.tmp
                                ;;
-                       armv7hl:exynos)
-                               # Exynos depends directly on the default configuration.
-                               ${SCRIPTS_DIR}/configdiff.py ${tmpdir}/config-armv7hl-default \
-                                       ${filename} > ${filename}.tmp
-                               ;;
                        armv5tel:versatile)
                                rm -f ${filename}
                                continue