diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/ac97_bus.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/ac97_bus.c')
| -rw-r--r-- | sound/ac97_bus.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/ac97_bus.c b/sound/ac97_bus.c index a351dd0a09c7..2b50cbe6aca9 100644 --- a/sound/ac97_bus.c +++ b/sound/ac97_bus.c | |||
| @@ -19,8 +19,8 @@ | |||
| 19 | 19 | ||
| 20 | /* | 20 | /* |
| 21 | * Let drivers decide whether they want to support given codec from their | 21 | * Let drivers decide whether they want to support given codec from their |
| 22 | * probe method. Drivers have direct access to the struct snd_ac97 structure and may | 22 | * probe method. Drivers have direct access to the struct snd_ac97 |
| 23 | * decide based on the id field amongst other things. | 23 | * structure and may decide based on the id field amongst other things. |
| 24 | */ | 24 | */ |
| 25 | static int ac97_bus_match(struct device *dev, struct device_driver *drv) | 25 | static int ac97_bus_match(struct device *dev, struct device_driver *drv) |
| 26 | { | 26 | { |