From d1a84dd38dd404018bfb418ee49b7605574090c5 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 15 Sep 2013 18:39:50 +0200
Subject: [PATCH] kernel: config changes on kirkwood and rpi kernel.

---
 config/kernel/kernel.config.armv5tel-ipfire-kirkwood | 4 ++--
 config/kernel/kernel.config.armv5tel-ipfire-rpi      | 9 ++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
index 4dd01d6f9..748fd25f2 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
+++ b/config/kernel/kernel.config.armv5tel-ipfire-kirkwood
@@ -4712,7 +4712,7 @@ CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 CONFIG_ENABLE_MUST_CHECK=y
 CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
+# CONFIG_MAGIC_SYSRQ is not set
 CONFIG_STRIP_ASM_SYMS=y
 # CONFIG_READABLE_ASM is not set
 # CONFIG_UNUSED_SYMBOLS is not set
@@ -4953,7 +4953,7 @@ CONFIG_GRKERNSEC_PROC_IPADDR=y
 CONFIG_GRKERNSEC_DMESG=y
 CONFIG_GRKERNSEC_HARDEN_PTRACE=y
 CONFIG_GRKERNSEC_PTRACE_READEXEC=y
-# CONFIG_GRKERNSEC_SETXID is not set
+CONFIG_GRKERNSEC_SETXID=y
 # CONFIG_GRKERNSEC_TPE is not set
 
 #
diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi
index 9ad830154..dbefe2999 100644
--- a/config/kernel/kernel.config.armv5tel-ipfire-rpi
+++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 3.10.10 Kernel Configuration
+# Linux/arm 3.10.11 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -3419,7 +3419,7 @@ CONFIG_USBIP_HOST=m
 # CONFIG_USBIP_DEBUG is not set
 # CONFIG_W35UND is not set
 # CONFIG_PRISM2_USB is not set
-# CONFIG_ECHO is not set
+CONFIG_ECHO=m
 # CONFIG_COMEDI is not set
 # CONFIG_ASUS_OLED is not set
 # CONFIG_PANEL is not set
@@ -3542,7 +3542,7 @@ CONFIG_USBIP_HOST=m
 # Android
 #
 # CONFIG_ANDROID is not set
-CONFIG_USB_WPAN_HCD=m
+# CONFIG_USB_WPAN_HCD is not set
 # CONFIG_WIMAX_GDM72XX is not set
 # CONFIG_CSR_WIFI is not set
 # CONFIG_CED1401 is not set
@@ -3554,8 +3554,7 @@ CONFIG_CLKDEV_LOOKUP=y
 # Hardware Spinlock drivers
 #
 # CONFIG_MAILBOX is not set
-CONFIG_IOMMU_SUPPORT=y
-CONFIG_OF_IOMMU=y
+# CONFIG_IOMMU_SUPPORT is not set
 
 #
 # Remoteproc drivers
-- 
2.39.2