Merge branch 'merge'

[karo-tx-linux.git] / drivers / scsi / mac53c94.c

diff --git a/drivers/scsi/mac53c94.c b/drivers/scsi/mac53c94.c
index 89ef34df5a1db443eb15b28727b5f9b91df413f1..6422de72bf4334ae29b4c81b499087e24d259c0f 100644 (file)
--- a/drivers/scsi/mac53c94.c
+++ b/drivers/scsi/mac53c94.c
@@ -431,7 +431,7 @@ static int mac53c94_probe(struct macio_dev *mdev, const struct of_device_id *mat
        struct fsc_state *state;
        struct Scsi_Host *host;
        void *dma_cmd_space;
-       unsigned char *clkprop;
+       const unsigned char *clkprop;
        int proplen, rc = -ENODEV;
 
        if (macio_resource_count(mdev) != 2 || macio_irq_count(mdev) != 2) {