Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso...

[karo-tx-linux.git] / drivers / ata / pata_samsung_cf.c

diff --git a/drivers/ata/pata_samsung_cf.c b/drivers/ata/pata_samsung_cf.c
index cbb5a471eb9d05c39b15ea1ab6c87fa1e4ee7464..f6facd686f9431b344468b7ba94653bdfac446f4 100644 (file)
--- a/drivers/ata/pata_samsung_cf.c
+++ b/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;
 };