diff options
| author | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 23:10:34 +0200 |
|---|---|---|
| committer | Kumar Gala <galak@kernel.crashing.org> | 2006-04-04 23:10:34 +0200 |
| commit | 12df7556705aae97f24a397377e17898700d7192 (patch) | |
| tree | 5adc6b1c2aa940263ee2e88fc6645918533da539 /arch/powerpc | |
| parent | powerpc/ppc: export strncasecmp (diff) | |
| parent | Linux v2.6.17-rc1 (diff) | |
| download | linux-12df7556705aae97f24a397377e17898700d7192.tar.xz linux-12df7556705aae97f24a397377e17898700d7192.zip | |
Merge branch 'master'
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/setup-common.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index c607f3b9ca17..1d93e73a7003 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -21,6 +21,7 @@ #include <linux/reboot.h> #include <linux/delay.h> #include <linux/initrd.h> +#include <linux/platform_device.h> #include <linux/ide.h> #include <linux/seq_file.h> #include <linux/ioport.h> @@ -462,6 +463,29 @@ static int __init early_xmon(char *p) early_param("xmon", early_xmon); #endif +static __init int add_pcspkr(void) +{ + struct device_node *np; + struct platform_device *pd; + int ret; + + np = of_find_compatible_node(NULL, NULL, "pnpPNP,100"); + of_node_put(np); + if (!np) + return -ENODEV; + + 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); + void probe_machine(void) { extern struct machdep_calls __machine_desc_start; |