diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-22 14:51:53 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-22 14:51:53 -0500 |
| commit | a6065b3dd8fa22efcedaf65517f4ec47ba25661d (patch) | |
| tree | f3aead47130b9fbe9fae7c88048f4963daba6463 /sound | |
| parent | 1eb42c73ca0a3692fb928e9f125cf84544ad5f12 (diff) | |
| parent | d8d3f25e6a3b7abb37d569b0e36adc069b190a3a (diff) | |
Merge commit 'd8d3f25' (misc branch) into linaro-2.6.38
Conflicts:
arch/arm/kernel/head.S
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/arm/aaci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 7c1fc64cb53..d0821f8974a 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c @@ -1011,7 +1011,8 @@ static unsigned int __devinit aaci_size_fifo(struct aaci *aaci) return i; } -static int __devinit aaci_probe(struct amba_device *dev, struct amba_id *id) +static int __devinit aaci_probe(struct amba_device *dev, + const struct amba_id *id) { struct aaci *aaci; int ret, i; |