diff options
| author | David S. Miller <davem@davemloft.net> | 2008-02-23 20:38:20 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-23 20:38:20 -0800 |
| commit | 8d3c202be23c5a915f7053ebd4e96f44700c6a62 (patch) | |
| tree | e0f017aff86d3ad0b858fe85f44e11096087ed00 /sound/ppc | |
| parent | 1b04ab4597725f75f94942da9aa40daa7b9a4bd9 (diff) | |
| parent | 038eb0ea04b245351be34b0ae76b55eee4603989 (diff) | |
Merge branch 'master' of ../linux-2.6/
Diffstat (limited to 'sound/ppc')
| -rw-r--r-- | sound/ppc/daca.c | 5 | ||||
| -rw-r--r-- | sound/ppc/tumbler.c | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sound/ppc/daca.c b/sound/ppc/daca.c index 8432c16cd6f..ca9452901a5 100644 --- a/sound/ppc/daca.c +++ b/sound/ppc/daca.c @@ -250,9 +250,8 @@ int __init snd_pmac_daca_init(struct snd_pmac *chip) struct pmac_daca *mix; #ifdef CONFIG_KMOD - if (current->fs->root) - request_module("i2c-powermac"); -#endif /* CONFIG_KMOD */ + request_module("i2c-powermac"); +#endif /* CONFIG_KMOD */ mix = kzalloc(sizeof(*mix), GFP_KERNEL); if (! mix) diff --git a/sound/ppc/tumbler.c b/sound/ppc/tumbler.c index 71a7a976542..3f8d7164cef 100644 --- a/sound/ppc/tumbler.c +++ b/sound/ppc/tumbler.c @@ -1351,9 +1351,8 @@ int __init snd_pmac_tumbler_init(struct snd_pmac *chip) char *chipname; #ifdef CONFIG_KMOD - if (current->fs->root) - request_module("i2c-powermac"); -#endif /* CONFIG_KMOD */ + request_module("i2c-powermac"); +#endif /* CONFIG_KMOD */ mix = kzalloc(sizeof(*mix), GFP_KERNEL); if (! mix) |