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/oss/dmasound/tas_common.c | |
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/oss/dmasound/tas_common.c')
-rw-r--r-- | sound/oss/dmasound/tas_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/oss/dmasound/tas_common.c b/sound/oss/dmasound/tas_common.c index 8131599..882ae98 100644 --- a/sound/oss/dmasound/tas_common.c +++ b/sound/oss/dmasound/tas_common.c @@ -195,8 +195,8 @@ tas_init(int driver_id, const char *driver_name) printk(KERN_INFO "tas driver [%s])\n", driver_name); -#ifndef CONFIG_I2C_KEYWEST - request_module("i2c-keywest"); +#ifndef CONFIG_I2C_POWERMAC + request_module("i2c-powermac"); #endif tas_node = find_devices("deq"); if (tas_node == NULL) |