summaryrefslogtreecommitdiffstats
path: root/drivers/ide/piix.c
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-04 17:11:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-06 03:04:41 +0900
commite6b53703b9966a3636be2bd4b7b8e0bfeb1b3f8d (patch)
tree6f08f1ed000481394fc8942a695b097141aa9b86 /drivers/ide/piix.c
parent1849f23d6ff57cf9d57741488adb14e0d7942406 (diff)
downloadlinux-stable-e6b53703b9966a3636be2bd4b7b8e0bfeb1b3f8d.tar.gz
linux-stable-e6b53703b9966a3636be2bd4b7b8e0bfeb1b3f8d.tar.bz2
linux-stable-e6b53703b9966a3636be2bd4b7b8e0bfeb1b3f8d.zip
sections: fix section conflicts in drivers/ide
Signed-off-by: Andi Kleen <ak@linux.intel.com> Cc: David Miller <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/ide/piix.c')
-rw-r--r--drivers/ide/piix.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/piix.c b/drivers/ide/piix.c
index 1892e81fb00f..fe0fd60cfc09 100644
--- a/drivers/ide/piix.c
+++ b/drivers/ide/piix.c
@@ -344,7 +344,7 @@ static const struct ide_port_ops ich_port_ops = {
.udma_mask = udma, \
}
-static const struct ide_port_info piix_pci_info[] __devinitdata = {
+static const struct ide_port_info piix_pci_info[] __devinitconst = {
/* 0: MPIIX */
{ /*
* MPIIX actually has only a single IDE channel mapped to