Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[mirror_ubuntu-zesty-kernel.git] / drivers / ide / cmd640.c

diff --git a/drivers/ide/cmd640.c b/drivers/ide/cmd640.c
index 14717304b3888fc5ce45eb2771629dc39368bd64..70f0a2754c13eb38b92010b55db25505716f92a5 100644 (file)
--- a/drivers/ide/cmd640.c
+++ b/drivers/ide/cmd640.c
@@ -685,7 +685,7 @@ static int pci_conf2(void)
        return 0;
 }
 
-static const struct ide_port_info cmd640_port_info __initdata = {
+static const struct ide_port_info cmd640_port_info __initconst = {
        .chipset                = ide_cmd640,
        .host_flags             = IDE_HFLAG_SERIALIZE |
                                  IDE_HFLAG_NO_DMA |