diff options
| author | David Teigland <teigland@redhat.com> | 2006-04-27 11:49:55 -0400 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-04-27 11:49:55 -0400 |
| commit | d26046bb0aff707aac38a9bf3dd56fa39b28a399 (patch) | |
| tree | c59e0514ca45cb56c3cbf7920a4590dad6975bcd /sound/oss/dmasound/tas_common.c | |
| parent | e7f5c01caddbad150dcf003f76cd5aac413f4c50 (diff) | |
| parent | 2be4d50295e2b6f62c07b614e1b103e280dddb84 (diff) | |
Merge branch 'master'
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 81315996c0f1..882ae98a41b1 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) | |||
| 195 | 195 | ||
| 196 | printk(KERN_INFO "tas driver [%s])\n", driver_name); | 196 | printk(KERN_INFO "tas driver [%s])\n", driver_name); |
| 197 | 197 | ||
| 198 | #ifndef CONFIG_I2C_KEYWEST | 198 | #ifndef CONFIG_I2C_POWERMAC |
| 199 | request_module("i2c-keywest"); | 199 | request_module("i2c-powermac"); |
| 200 | #endif | 200 | #endif |
| 201 | tas_node = find_devices("deq"); | 201 | tas_node = find_devices("deq"); |
| 202 | if (tas_node == NULL) | 202 | if (tas_node == NULL) |