diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:18:00 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:18:00 -0400 |
| commit | 45de6fd958d7f407bdb5fdc6914b3262519d891c (patch) | |
| tree | c1b9f9023e93d0f28f773ca4be41d107f79cd600 /sound/ppc/daca.c | |
| parent | 1f5d5dbf0372dd933d8325054889ba09d996e50b (diff) | |
| parent | 3b908870b8332dfd40be0e919e187aa4991536fb (diff) | |
Merge branch 'upstream-fixes' into upstream
Diffstat (limited to 'sound/ppc/daca.c')
| -rw-r--r-- | sound/ppc/daca.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c index aa09ebd9ffb8..46eebf5610e3 100644 --- a/sound/ppc/daca.c +++ b/sound/ppc/daca.c | |||
| @@ -255,7 +255,7 @@ int __init snd_pmac_daca_init(struct snd_pmac *chip) | |||
| 255 | 255 | ||
| 256 | #ifdef CONFIG_KMOD | 256 | #ifdef CONFIG_KMOD |
| 257 | if (current->fs->root) | 257 | if (current->fs->root) |
| 258 | request_module("i2c-keywest"); | 258 | request_module("i2c-powermac"); |
| 259 | #endif /* CONFIG_KMOD */ | 259 | #endif /* CONFIG_KMOD */ |
| 260 | 260 | ||
| 261 | mix = kmalloc(sizeof(*mix), GFP_KERNEL); | 261 | mix = kmalloc(sizeof(*mix), GFP_KERNEL); |