diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-04-08 18:04:48 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-08 18:04:52 +0200 |
| commit | 280ff388b1b7a818a64af4c789299e62c0d3c094 (patch) | |
| tree | d63877375029eb895131a37d2eeeac306cc6c7f0 /sound/ppc | |
| parent | c5da9a2bb24a7928c39495cdabf98d3f7931bde5 (diff) | |
| parent | 577c9c456f0e1371cbade38eaf91ae8e8a308555 (diff) | |
| download | blackbird-op-linux-280ff388b1b7a818a64af4c789299e62c0d3c094.tar.gz blackbird-op-linux-280ff388b1b7a818a64af4c789299e62c0d3c094.zip | |
Merge commit 'v2.6.30-rc1' into x86/urgent
Merge reason: fix to be queued up depends on upstream facilities
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/ppc')
| -rw-r--r-- | sound/ppc/powermac.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/ppc/powermac.c b/sound/ppc/powermac.c index 5a929069dce9..a2b69b8cff43 100644 --- a/sound/ppc/powermac.c +++ b/sound/ppc/powermac.c @@ -51,7 +51,7 @@ static struct platform_device *device; /* */ -static int __init snd_pmac_probe(struct platform_device *devptr) +static int __devinit snd_pmac_probe(struct platform_device *devptr) { struct snd_card *card; struct snd_pmac *chip; |
