git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
[sfrench/cifs-2.6.git]
/
sound
/
ppc
/
tumbler.c
diff --git
a/sound/ppc/tumbler.c
b/sound/ppc/tumbler.c
index 71a7a97654298b8545184d20dd633bfab4317113..3f8d7164cef9438407b3f00128739438f92069b7 100644
(file)
--- 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)