These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / ata / pata_samsung_cf.c

diff --git a/kernel/drivers/ata/pata_samsung_cf.c b/kernel/drivers/ata/pata_samsung_cf.c
index fa44eb2..f6facd6 100644 (file)
--- a/kernel/drivers/ata/pata_samsung_cf.c
+++ b/kernel/drivers/ata/pata_samsung_cf.c
@@ -70,7 +70,7 @@ struct s3c_ide_info {
        struct clk *clk;
        void __iomem *ide_addr;
        void __iomem *sfr_addr;
-       unsigned int irq;
+       int irq;
        enum s3c_cpu_type cpu_type;
        unsigned int fifo_status_reg;
 };
@@ -638,7 +638,7 @@ static const struct dev_pm_ops pata_s3c_pm_ops = {
 #endif
 
 /* driver device registration */
-static struct platform_device_id pata_s3c_driver_ids[] = {
+static const struct platform_device_id pata_s3c_driver_ids[] = {
        {
                .name           = "s3c64xx-pata",
                .driver_data    = TYPE_S3C64XX,