diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/kernel/setup_32.c | 4 | ||||
-rw-r--r-- | arch/powerpc/kernel/setup_64.c | 5 | ||||
-rw-r--r-- | arch/ppc/kernel/setup.c | 4 |
3 files changed, 0 insertions, 13 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index e0df2ba1ab9f..79a17795d17b 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c | |||
@@ -67,10 +67,6 @@ int have_of = 1; | |||
67 | dev_t boot_dev; | 67 | dev_t boot_dev; |
68 | #endif /* CONFIG_PPC_MULTIPLATFORM */ | 68 | #endif /* CONFIG_PPC_MULTIPLATFORM */ |
69 | 69 | ||
70 | #ifdef CONFIG_MAGIC_SYSRQ | ||
71 | unsigned long SYSRQ_KEY = 0x54; | ||
72 | #endif /* CONFIG_MAGIC_SYSRQ */ | ||
73 | |||
74 | #ifdef CONFIG_VGA_CONSOLE | 70 | #ifdef CONFIG_VGA_CONSOLE |
75 | unsigned long vgacon_remap_base; | 71 | unsigned long vgacon_remap_base; |
76 | #endif | 72 | #endif |
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 00d6b8addd78..962ad5ebc767 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c | |||
@@ -93,11 +93,6 @@ int dcache_bsize; | |||
93 | int icache_bsize; | 93 | int icache_bsize; |
94 | int ucache_bsize; | 94 | int ucache_bsize; |
95 | 95 | ||
96 | #ifdef CONFIG_MAGIC_SYSRQ | ||
97 | unsigned long SYSRQ_KEY; | ||
98 | #endif /* CONFIG_MAGIC_SYSRQ */ | ||
99 | |||
100 | |||
101 | #ifdef CONFIG_SMP | 96 | #ifdef CONFIG_SMP |
102 | 97 | ||
103 | static int smt_enabled_cmdline; | 98 | static int smt_enabled_cmdline; |
diff --git a/arch/ppc/kernel/setup.c b/arch/ppc/kernel/setup.c index 5458ac5da7c3..75fe13815be2 100644 --- a/arch/ppc/kernel/setup.c +++ b/arch/ppc/kernel/setup.c | |||
@@ -86,10 +86,6 @@ int ppc_do_canonicalize_irqs; | |||
86 | EXPORT_SYMBOL(ppc_do_canonicalize_irqs); | 86 | EXPORT_SYMBOL(ppc_do_canonicalize_irqs); |
87 | #endif | 87 | #endif |
88 | 88 | ||
89 | #ifdef CONFIG_MAGIC_SYSRQ | ||
90 | unsigned long SYSRQ_KEY = 0x54; | ||
91 | #endif /* CONFIG_MAGIC_SYSRQ */ | ||
92 | |||
93 | #ifdef CONFIG_VGA_CONSOLE | 89 | #ifdef CONFIG_VGA_CONSOLE |
94 | unsigned long vgacon_remap_base; | 90 | unsigned long vgacon_remap_base; |
95 | #endif | 91 | #endif |