aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/setup.c
diff options
context:
space:
mode:
authorAndi Kleen <ak@suse.de>2007-02-13 07:26:26 -0500
committerAndi Kleen <andi@basil.nowhere.org>2007-02-13 07:26:26 -0500
commit62cc49396e593dd71c6595302bb10b085aefbfa5 (patch)
treea4487294b3ea5c6b4f90fb9b4fd46a64b852d450 /arch/x86_64/kernel/setup.c
parent40d22c1b5675e428b3f3f9a945d0bd62e94ca2f1 (diff)
[PATCH] x86: Unify pcspeaker platform device code between i386/x86-64
Trivial cleanup. Only change is that it is always compiled in now on x86-64 like on i386. Signed-off-by: Andi Kleen <ak@suse.de>
Diffstat (limited to 'arch/x86_64/kernel/setup.c')
-rw-r--r--arch/x86_64/kernel/setup.c20
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 13daaf359d21..3d98b696881d 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -1104,23 +1104,3 @@ struct seq_operations cpuinfo_op = {
1104 .stop = c_stop, 1104 .stop = c_stop,
1105 .show = show_cpuinfo, 1105 .show = show_cpuinfo,
1106}; 1106};
1107
1108#if defined(CONFIG_INPUT_PCSPKR) || defined(CONFIG_INPUT_PCSPKR_MODULE)
1109#include <linux/platform_device.h>
1110static __init int add_pcspkr(void)
1111{
1112 struct platform_device *pd;
1113 int ret;
1114
1115 pd = platform_device_alloc("pcspkr", -1);
1116 if (!pd)
1117 return -ENOMEM;
1118
1119 ret = platform_device_add(pd);
1120 if (ret)
1121 platform_device_put(pd);
1122
1123 return ret;
1124}
1125device_initcall(add_pcspkr);
1126#endif