diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-05-07 23:37:51 -0400 |
| commit | 02bbc0f09c90cefdb2837605c96a66c5ce4ba2e1 (patch) | |
| tree | 04ef573cd4de095c500c9fc3477f4278c0b36300 /drivers/input/misc/pcspkr.c | |
| parent | 7487a2245b8841c77ba9db406cf99a483b9334e9 (diff) | |
| parent | 5b94f675f57e4ff16c8fda09088d7480a84dcd91 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/input/misc/pcspkr.c')
| -rw-r--r-- | drivers/input/misc/pcspkr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c index afd322185bbf..31989dcd922c 100644 --- a/drivers/input/misc/pcspkr.c +++ b/drivers/input/misc/pcspkr.c | |||
| @@ -78,7 +78,7 @@ static int __devinit pcspkr_probe(struct platform_device *dev) | |||
| 78 | pcspkr_dev->id.vendor = 0x001f; | 78 | pcspkr_dev->id.vendor = 0x001f; |
| 79 | pcspkr_dev->id.product = 0x0001; | 79 | pcspkr_dev->id.product = 0x0001; |
| 80 | pcspkr_dev->id.version = 0x0100; | 80 | pcspkr_dev->id.version = 0x0100; |
| 81 | pcspkr_dev->cdev.dev = &dev->dev; | 81 | pcspkr_dev->dev.parent = &dev->dev; |
| 82 | 82 | ||
| 83 | pcspkr_dev->evbit[0] = BIT(EV_SND); | 83 | pcspkr_dev->evbit[0] = BIT(EV_SND); |
| 84 | pcspkr_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE); | 84 | pcspkr_dev->sndbit[0] = BIT(SND_BELL) | BIT(SND_TONE); |