git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into timers/nohz
[pandora-kernel.git]
/
sound
/
ppc
/
tumbler.c
diff --git
a/sound/ppc/tumbler.c
b/sound/ppc/tumbler.c
index
71a7a97
..
009df8d
100644
(file)
--- a/
sound/ppc/tumbler.c
+++ b/
sound/ppc/tumbler.c
@@
-1350,10
+1350,7
@@
int __init snd_pmac_tumbler_init(struct snd_pmac *chip)
struct device_node *tas_node, *np;
char *chipname;
-#ifdef CONFIG_KMOD
- if (current->fs->root)
- request_module("i2c-powermac");
-#endif /* CONFIG_KMOD */
+ request_module("i2c-powermac");
mix = kzalloc(sizeof(*mix), GFP_KERNEL);
if (! mix)