From 867ac59ff97fc53ff1d205be3a176b6409e358f2 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Mon, 30 Aug 2010 22:59:20 +0000 Subject: [PATCH] enable SYSRQ for all targets, remove overrides from brcm63xx, octeon and omap35xx SVN-Revision: 22846 --- target/linux/brcm63xx/config-2.6.32 | 1 - target/linux/brcm63xx/config-2.6.33 | 1 - target/linux/brcm63xx/config-2.6.35 | 1 - target/linux/generic/config-2.6.25 | 2 +- target/linux/generic/config-2.6.30 | 2 +- target/linux/generic/config-2.6.31 | 2 +- target/linux/generic/config-2.6.32 | 2 +- target/linux/generic/config-2.6.33 | 2 +- target/linux/generic/config-2.6.34 | 2 +- target/linux/generic/config-2.6.35 | 2 +- target/linux/octeon/config-2.6.30 | 1 - target/linux/octeon/config-2.6.34 | 1 - target/linux/omap35xx/config-2.6.32 | 1 - 13 files changed, 7 insertions(+), 13 deletions(-) diff --git a/target/linux/brcm63xx/config-2.6.32 b/target/linux/brcm63xx/config-2.6.32 index f308e2f2ba2..5512728db91 100644 --- a/target/linux/brcm63xx/config-2.6.32 +++ b/target/linux/brcm63xx/config-2.6.32 @@ -115,7 +115,6 @@ CONFIG_LEDS_GPIO=y # CONFIG_MACH_TX39XX is not set # CONFIG_MACH_TX49XX is not set # CONFIG_MACH_VR41XX is not set -CONFIG_MAGIC_SYSRQ=y # CONFIG_MIKROTIK_RB532 is not set CONFIG_MIPS=y # CONFIG_MIPS_COBALT is not set diff --git a/target/linux/brcm63xx/config-2.6.33 b/target/linux/brcm63xx/config-2.6.33 index 519aab1c26b..a2def661e00 100644 --- a/target/linux/brcm63xx/config-2.6.33 +++ b/target/linux/brcm63xx/config-2.6.33 @@ -127,7 +127,6 @@ CONFIG_LOONGSON_UART_BASE=y # CONFIG_MACH_TX39XX is not set # CONFIG_MACH_TX49XX is not set # CONFIG_MACH_VR41XX is not set -CONFIG_MAGIC_SYSRQ=y # CONFIG_MIKROTIK_RB532 is not set CONFIG_MIPS=y # CONFIG_MIPS_COBALT is not set diff --git a/target/linux/brcm63xx/config-2.6.35 b/target/linux/brcm63xx/config-2.6.35 index 519aab1c26b..a2def661e00 100644 --- a/target/linux/brcm63xx/config-2.6.35 +++ b/target/linux/brcm63xx/config-2.6.35 @@ -127,7 +127,6 @@ CONFIG_LOONGSON_UART_BASE=y # CONFIG_MACH_TX39XX is not set # CONFIG_MACH_TX49XX is not set # CONFIG_MACH_VR41XX is not set -CONFIG_MAGIC_SYSRQ=y # CONFIG_MIKROTIK_RB532 is not set CONFIG_MIPS=y # CONFIG_MIPS_COBALT is not set diff --git a/target/linux/generic/config-2.6.25 b/target/linux/generic/config-2.6.25 index 75b5d65b12f..97f7ac8d8ae 100644 --- a/target/linux/generic/config-2.6.25 +++ b/target/linux/generic/config-2.6.25 @@ -789,7 +789,7 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_MAC_EMUMOUSEBTN is not set # CONFIG_MAC_PARTITION is not set # CONFIG_MACVLAN is not set -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y # CONFIG_MARKEINS is not set # CONFIG_MARKERS is not set # CONFIG_MARVELL_PHY is not set diff --git a/target/linux/generic/config-2.6.30 b/target/linux/generic/config-2.6.30 index ce344a4805f..b2b7b214375 100644 --- a/target/linux/generic/config-2.6.30 +++ b/target/linux/generic/config-2.6.30 @@ -1128,7 +1128,7 @@ CONFIG_LOG_BUF_SHIFT=14 # CONFIG_MACINTOSH_DRIVERS is not set # CONFIG_MAC_PARTITION is not set # CONFIG_MACVLAN is not set -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y # CONFIG_MARKEINS is not set # CONFIG_MARKERS is not set # CONFIG_MARVELL_PHY is not set diff --git a/target/linux/generic/config-2.6.31 b/target/linux/generic/config-2.6.31 index 3296c402fac..7dfe4edb129 100644 --- a/target/linux/generic/config-2.6.31 +++ b/target/linux/generic/config-2.6.31 @@ -1125,7 +1125,7 @@ CONFIG_MAC80211_DEFAULT_PS=y # CONFIG_MACINTOSH_DRIVERS is not set # CONFIG_MAC_PARTITION is not set # CONFIG_MACVLAN is not set -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y # CONFIG_MARKEINS is not set # CONFIG_MARKERS is not set # CONFIG_MARVELL_PHY is not set diff --git a/target/linux/generic/config-2.6.32 b/target/linux/generic/config-2.6.32 index e3847e5fab6..23a06740b37 100644 --- a/target/linux/generic/config-2.6.32 +++ b/target/linux/generic/config-2.6.32 @@ -1197,7 +1197,7 @@ CONFIG_MAC80211_DEFAULT_PS=y # CONFIG_MACINTOSH_DRIVERS is not set # CONFIG_MAC_PARTITION is not set # CONFIG_MACVLAN is not set -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y # CONFIG_MARKEINS is not set # CONFIG_MARKERS is not set # CONFIG_MARVELL_PHY is not set diff --git a/target/linux/generic/config-2.6.33 b/target/linux/generic/config-2.6.33 index e7d16e59f97..7145be7905b 100644 --- a/target/linux/generic/config-2.6.33 +++ b/target/linux/generic/config-2.6.33 @@ -1236,7 +1236,7 @@ CONFIG_MAC80211_DEFAULT_PS=y # CONFIG_MACINTOSH_DRIVERS is not set # CONFIG_MAC_PARTITION is not set # CONFIG_MACVLAN is not set -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y # CONFIG_MARKEINS is not set # CONFIG_MARKERS is not set # CONFIG_MARVELL_PHY is not set diff --git a/target/linux/generic/config-2.6.34 b/target/linux/generic/config-2.6.34 index cec70962b8d..0aa8723e901 100644 --- a/target/linux/generic/config-2.6.34 +++ b/target/linux/generic/config-2.6.34 @@ -1264,7 +1264,7 @@ CONFIG_MAC80211_DEFAULT_PS=y # CONFIG_MAC_PARTITION is not set # CONFIG_MACVLAN is not set # CONFIG_MACVTAP is not set -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y # CONFIG_MARKEINS is not set # CONFIG_MARKERS is not set # CONFIG_MARVELL_PHY is not set diff --git a/target/linux/generic/config-2.6.35 b/target/linux/generic/config-2.6.35 index c3b1d2e7dd4..52e95d1a04b 100644 --- a/target/linux/generic/config-2.6.35 +++ b/target/linux/generic/config-2.6.35 @@ -1305,7 +1305,7 @@ CONFIG_MAC80211_DEFAULT_PS=y # CONFIG_MAC_PARTITION is not set # CONFIG_MACVLAN is not set # CONFIG_MACVTAP is not set -# CONFIG_MAGIC_SYSRQ is not set +CONFIG_MAGIC_SYSRQ=y # CONFIG_MARKEINS is not set # CONFIG_MARKERS is not set # CONFIG_MARVELL_PHY is not set diff --git a/target/linux/octeon/config-2.6.30 b/target/linux/octeon/config-2.6.30 index b0c96c11de6..59d1375bddf 100644 --- a/target/linux/octeon/config-2.6.30 +++ b/target/linux/octeon/config-2.6.30 @@ -165,7 +165,6 @@ CONFIG_LOCK_KERNEL=y # CONFIG_MACH_TX39XX is not set # CONFIG_MACH_TX49XX is not set # CONFIG_MACH_VR41XX is not set -CONFIG_MAGIC_SYSRQ=y # CONFIG_ME4000 is not set # CONFIG_MEILHAUS is not set # CONFIG_MIKROTIK_RB532 is not set diff --git a/target/linux/octeon/config-2.6.34 b/target/linux/octeon/config-2.6.34 index 797e9e14647..e5e38998d65 100644 --- a/target/linux/octeon/config-2.6.34 +++ b/target/linux/octeon/config-2.6.34 @@ -147,7 +147,6 @@ CONFIG_LOONGSON_UART_BASE=y # CONFIG_MACH_TX39XX is not set # CONFIG_MACH_TX49XX is not set # CONFIG_MACH_VR41XX is not set -CONFIG_MAGIC_SYSRQ=y CONFIG_MDIO_OCTEON=y # CONFIG_MIKROTIK_RB532 is not set CONFIG_MIPS=y diff --git a/target/linux/omap35xx/config-2.6.32 b/target/linux/omap35xx/config-2.6.32 index 3d41ebf1f1f..e814d792618 100644 --- a/target/linux/omap35xx/config-2.6.32 +++ b/target/linux/omap35xx/config-2.6.32 @@ -663,7 +663,6 @@ CONFIG_MACH_OMAP3_BEAGLE=y # CONFIG_MACH_OVERO is not set # CONFIG_MAC_PARTITION is not set # CONFIG_MACVLAN is not set -CONFIG_MAGIC_SYSRQ=y # CONFIG_MD is not set # CONFIG_MEDIA_ATTACH is not set CONFIG_MEDIA_SUPPORT=y