diff options
| author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 17:11:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-06 03:04:41 +0900 |
| commit | e6b53703b9966a3636be2bd4b7b8e0bfeb1b3f8d (patch) | |
| tree | 6f08f1ed000481394fc8942a695b097141aa9b86 /drivers/ide/cmd640.c | |
| parent | 1849f23d6ff57cf9d57741488adb14e0d7942406 (diff) | |
| download | blackbird-op-linux-e6b53703b9966a3636be2bd4b7b8e0bfeb1b3f8d.tar.gz blackbird-op-linux-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/cmd640.c')
| -rw-r--r-- | drivers/ide/cmd640.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/cmd640.c b/drivers/ide/cmd640.c index 14717304b388..70f0a2754c13 100644 --- a/drivers/ide/cmd640.c +++ b/drivers/ide/cmd640.c @@ -685,7 +685,7 @@ static int pci_conf2(void) return 0; } -static const struct ide_port_info cmd640_port_info __initdata = { +static const struct ide_port_info cmd640_port_info __initconst = { .chipset = ide_cmd640, .host_flags = IDE_HFLAG_SERIALIZE | IDE_HFLAG_NO_DMA | |
