diff options
Diffstat (limited to 'sound/oss')
-rw-r--r-- | sound/oss/dmasound/dmasound_awacs.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sound/oss/dmasound/dmasound_awacs.c b/sound/oss/dmasound/dmasound_awacs.c index 730fa1d001a5..8f6388004f44 100644 --- a/sound/oss/dmasound/dmasound_awacs.c +++ b/sound/oss/dmasound/dmasound_awacs.c | |||
@@ -362,7 +362,7 @@ setup_audio_gpio(const char *name, const char* compatible, int *gpio_addr, int* | |||
362 | of_get_property(np,"audio-gpio",NULL); | 362 | of_get_property(np,"audio-gpio",NULL); |
363 | if (property != 0 && strcmp(property,name) == 0) | 363 | if (property != 0 && strcmp(property,name) == 0) |
364 | break; | 364 | break; |
365 | } else if (compatible && device_is_compatible(np, compatible)) | 365 | } else if (compatible && of_device_is_compatible(np, compatible)) |
366 | break; | 366 | break; |
367 | np = of_get_next_child(gpiop, np); | 367 | np = of_get_next_child(gpiop, np); |
368 | } | 368 | } |
@@ -2620,17 +2620,17 @@ get_codec_type(struct device_node *info) | |||
2620 | 2620 | ||
2621 | if (info) { | 2621 | if (info) { |
2622 | /* must do awacs first to allow screamer to overide it */ | 2622 | /* must do awacs first to allow screamer to overide it */ |
2623 | if (device_is_compatible(info, "awacs")) | 2623 | if (of_device_is_compatible(info, "awacs")) |
2624 | codec = AWACS_AWACS ; | 2624 | codec = AWACS_AWACS ; |
2625 | if (device_is_compatible(info, "screamer")) | 2625 | if (of_device_is_compatible(info, "screamer")) |
2626 | codec = AWACS_SCREAMER; | 2626 | codec = AWACS_SCREAMER; |
2627 | if (device_is_compatible(info, "burgundy")) | 2627 | if (of_device_is_compatible(info, "burgundy")) |
2628 | codec = AWACS_BURGUNDY ; | 2628 | codec = AWACS_BURGUNDY ; |
2629 | if (device_is_compatible(info, "daca")) | 2629 | if (of_device_is_compatible(info, "daca")) |
2630 | codec = AWACS_DACA; | 2630 | codec = AWACS_DACA; |
2631 | if (device_is_compatible(info, "tumbler")) | 2631 | if (of_device_is_compatible(info, "tumbler")) |
2632 | codec = AWACS_TUMBLER; | 2632 | codec = AWACS_TUMBLER; |
2633 | if (device_is_compatible(info, "snapper")) | 2633 | if (of_device_is_compatible(info, "snapper")) |
2634 | codec = AWACS_SNAPPER; | 2634 | codec = AWACS_SNAPPER; |
2635 | } | 2635 | } |
2636 | return codec ; | 2636 | return codec ; |
@@ -2772,7 +2772,7 @@ set_hw_byteswap(struct device_node *io) | |||
2772 | 2772 | ||
2773 | for (mio = io->parent; mio ; mio = mio->parent) { | 2773 | for (mio = io->parent; mio ; mio = mio->parent) { |
2774 | if (strcmp(mio->name, "mac-io") == 0) { | 2774 | if (strcmp(mio->name, "mac-io") == 0) { |
2775 | if (device_is_compatible(mio, "Keylargo")) | 2775 | if (of_device_is_compatible(mio, "Keylargo")) |
2776 | kl = 1; | 2776 | kl = 1; |
2777 | break; | 2777 | break; |
2778 | } | 2778 | } |