diff options
author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 20:11:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:41 -0400 |
commit | e6b53703b9966a3636be2bd4b7b8e0bfeb1b3f8d (patch) | |
tree | 6f08f1ed000481394fc8942a695b097141aa9b86 /drivers/ide/piix.c | |
parent | 1849f23d6ff57cf9d57741488adb14e0d7942406 (diff) |
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.c | 2 |
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 = { | |||
344 | .udma_mask = udma, \ | 344 | .udma_mask = udma, \ |
345 | } | 345 | } |
346 | 346 | ||
347 | static const struct ide_port_info piix_pci_info[] __devinitdata = { | 347 | static const struct ide_port_info piix_pci_info[] __devinitconst = { |
348 | /* 0: MPIIX */ | 348 | /* 0: MPIIX */ |
349 | { /* | 349 | { /* |
350 | * MPIIX actually has only a single IDE channel mapped to | 350 | * MPIIX actually has only a single IDE channel mapped to |