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/tx4939ide.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/tx4939ide.c')
-rw-r--r-- | drivers/ide/tx4939ide.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c index 71c231954972..c0ab800b7bb3 100644 --- a/drivers/ide/tx4939ide.c +++ b/drivers/ide/tx4939ide.c | |||
@@ -522,7 +522,7 @@ static const struct ide_dma_ops tx4939ide_dma_ops = { | |||
522 | .dma_sff_read_status = tx4939ide_dma_sff_read_status, | 522 | .dma_sff_read_status = tx4939ide_dma_sff_read_status, |
523 | }; | 523 | }; |
524 | 524 | ||
525 | static const struct ide_port_info tx4939ide_port_info __initdata = { | 525 | static const struct ide_port_info tx4939ide_port_info __initconst = { |
526 | .init_hwif = tx4939ide_init_hwif, | 526 | .init_hwif = tx4939ide_init_hwif, |
527 | .init_dma = tx4939ide_init_dma, | 527 | .init_dma = tx4939ide_init_dma, |
528 | .port_ops = &tx4939ide_port_ops, | 528 | .port_ops = &tx4939ide_port_ops, |