diff options
author | Andi Kleen <ak@suse.de> | 2007-02-13 15:26:26 +0300 |
---|---|---|
committer | Andi Kleen <andi@basil.nowhere.org> | 2007-02-13 15:26:26 +0300 |
commit | 62cc49396e593dd71c6595302bb10b085aefbfa5 (patch) | |
tree | a4487294b3ea5c6b4f90fb9b4fd46a64b852d450 /arch/i386/kernel/setup.c | |
parent | 40d22c1b5675e428b3f3f9a945d0bd62e94ca2f1 (diff) | |
download | linux-62cc49396e593dd71c6595302bb10b085aefbfa5.tar.xz |
[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/i386/kernel/setup.c')
-rw-r--r-- | arch/i386/kernel/setup.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index bd8c218d94af..122623dcc6e1 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c @@ -33,7 +33,6 @@ #include <linux/initrd.h> #include <linux/bootmem.h> #include <linux/seq_file.h> -#include <linux/platform_device.h> #include <linux/console.h> #include <linux/mca.h> #include <linux/root_dev.h> @@ -660,28 +659,3 @@ void __init setup_arch(char **cmdline_p) #endif tsc_init(); } - -static __init int add_pcspkr(void) -{ - struct platform_device *pd; - int ret; - - pd = platform_device_alloc("pcspkr", -1); - if (!pd) - return -ENOMEM; - - ret = platform_device_add(pd); - if (ret) - platform_device_put(pd); - - return ret; -} -device_initcall(add_pcspkr); - -/* - * Local Variables: - * mode:c - * c-file-style:"k&r" - * c-basic-offset:8 - * End: - */ |