Merge branch 'master' into next

[mv-sheeva.git] / drivers / scsi / sun_esp.c

diff --git a/drivers/scsi/sun_esp.c b/drivers/scsi/sun_esp.c
index 97316ca28a7a36b9437c4625f7d6a5562dbb46ca..3d73aad4bc8201196946e2a1e2c19e4e98157327 100644 (file)
--- a/drivers/scsi/sun_esp.c
+++ b/drivers/scsi/sun_esp.c
@@ -617,7 +617,7 @@ static int __devexit esp_sbus_remove(struct of_device *op)
        return 0;
 }
 
-static struct of_device_id esp_match[] = {
+static const struct of_device_id esp_match[] = {
        {
                .name = "SUNW,esp",
        },