diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:15:27 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-26 06:15:27 -0400 |
commit | 25f73891c3059e9ce6ff0a02670aa98baf6cbce9 (patch) | |
tree | 18a2ef934aa353ca695c3faaa3b7497fea22037a /sound/ppc | |
parent | fef6108d4556917c45cd9ba397c1c7597f3990e1 (diff) | |
parent | 4d5c34ec7b007cfb0771a36996b009f194acbb2f (diff) | |
download | op-kernel-dev-25f73891c3059e9ce6ff0a02670aa98baf6cbce9.zip op-kernel-dev-25f73891c3059e9ce6ff0a02670aa98baf6cbce9.tar.gz |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'sound/ppc')
-rw-r--r-- | sound/ppc/daca.c | 2 | ||||
-rw-r--r-- | sound/ppc/tumbler.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c index aa09ebd..46eebf5 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) #ifdef CONFIG_KMOD if (current->fs->root) - request_module("i2c-keywest"); + request_module("i2c-powermac"); #endif /* CONFIG_KMOD */ mix = kmalloc(sizeof(*mix), GFP_KERNEL); diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 1146dd8..70e4ebc 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c @@ -1313,7 +1313,7 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip) #ifdef CONFIG_KMOD if (current->fs->root) - request_module("i2c-keywest"); + request_module("i2c-powermac"); #endif /* CONFIG_KMOD */ mix = kmalloc(sizeof(*mix), GFP_KERNEL); |