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/atiixp.c | |
parent | 1849f23d6ff57cf9d57741488adb14e0d7942406 (diff) | |
download | talos-obmc-linux-e6b53703b9966a3636be2bd4b7b8e0bfeb1b3f8d.tar.gz talos-obmc-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/atiixp.c')
-rw-r--r-- | drivers/ide/atiixp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/atiixp.c b/drivers/ide/atiixp.c index 15f0ead89f5c..cb43480b1bd5 100644 --- a/drivers/ide/atiixp.c +++ b/drivers/ide/atiixp.c @@ -139,7 +139,7 @@ static const struct ide_port_ops atiixp_port_ops = { .cable_detect = atiixp_cable_detect, }; -static const struct ide_port_info atiixp_pci_info[] __devinitdata = { +static const struct ide_port_info atiixp_pci_info[] __devinitconst = { { /* 0: IXP200/300/400/700 */ .name = DRV_NAME, .enablebits = {{0x48,0x01,0x00}, {0x48,0x08,0x00}}, |