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 /drivers/spi/amba-pl022.c | |
| 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 'drivers/spi/amba-pl022.c')
| -rw-r--r-- | drivers/spi/amba-pl022.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c index 71a1219a995..95e58c70a2c 100644 --- a/drivers/spi/amba-pl022.c +++ b/drivers/spi/amba-pl022.c @@ -2021,7 +2021,7 @@ static void pl022_cleanup(struct spi_device *spi) static int __devinit -pl022_probe(struct amba_device *adev, struct amba_id *id) +pl022_probe(struct amba_device *adev, const struct amba_id *id) { struct device *dev = &adev->dev; struct pl022_ssp_controller *platform_info = adev->dev.platform_data; |