Merge branch 'nfs-for-2.6.39' into nfs-for-next

[mv-sheeva.git] / drivers / gpio / pl061.c

diff --git a/drivers/gpio/pl061.c b/drivers/gpio/pl061.c
index 2975d22daffee82e89a32810c58986fd0376899f..838ddbdf90cc22fe0a69ec7b84153f52cdaf4baf 100644 (file)
--- a/drivers/gpio/pl061.c
+++ b/drivers/gpio/pl061.c
@@ -232,7 +232,7 @@ static void pl061_irq_handler(unsigned irq, struct irq_desc *desc)
        desc->irq_data.chip->irq_unmask(&desc->irq_data);
 }
 
-static int pl061_probe(struct amba_device *dev, struct amba_id *id)
+static int pl061_probe(struct amba_device *dev, const struct amba_id *id)
 {
        struct pl061_platform_data *pdata;
        struct pl061_gpio *chip;