• Bartlomiej Zolnierkiewicz's avatar
    cy82c693: fix build for CONFIG_HOTPLUG=n · f32d26ae
    Bartlomiej Zolnierkiewicz authored
    On Saturday 20 October 2007, Avuton Olrich wrote:
    
    > My randconfig script the attached config caught an error on:
    > drivers/ide/pci/cy82c693.c:439: error: primary causes a section type conflict
    >
    > My git tree: c00046c2
    >
    > Bisected to:
    > 85620436 is first bad commit
    > commit 85620436
    > Author: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    > Date:   Sat Oct 20 00:32:34 2007 +0200
    >
    >     ide: constify struct ide_port_info
    >
    >     Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    
    It turns out that const and __{dev}initdata cannot be mixed currently.
    
    This patch workarounds the problem by removing __devinitdata tag from 'primary'
    variable (which makes 'primary' to be moved from .init.data to .bss section).
    Now all __devinitdata data in cy82c693 host driver are read-only so it builds
    again (driver's .init.data section gets marked as READONLY).
    
    While at it:
    
    * Move 'primary' variable to its only user, init_iops_cy82c693().
    
    * Bump driver version.
    
    Cc: "Avuton Olrich" <avuton@gmail.com>
    Cc: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
    f32d26ae
cy82c693.c 14.5 KB