From: Bartlomiej Zolnierkiewicz Date: Fri, 26 Oct 2007 18:31:15 +0000 (+0200) Subject: cy82c693: fix build for CONFIG_HOTPLUG=n X-Git-Tag: v2.6.24-rc2~118^2~4 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f32d26ae2649c17df742f8db48b438eba2c38400;p=pandora-kernel.git cy82c693: fix build for CONFIG_HOTPLUG=n 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: c00046c279a2521075250fad682ca0acc10d4fd7 > > Bisected to: > 8562043606430185cad26d085d46adcc7ad67fd1 is first bad commit > commit 8562043606430185cad26d085d46adcc7ad67fd1 > Author: Bartlomiej Zolnierkiewicz > Date: Sat Oct 20 00:32:34 2007 +0200 > > ide: constify struct ide_port_info > > Signed-off-by: Bartlomiej Zolnierkiewicz 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" Cc: Randy Dunlap Signed-off-by: Bartlomiej Zolnierkiewicz --- Reading git-diff-tree failed