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/jmicron.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/jmicron.c')
-rw-r--r-- | drivers/ide/jmicron.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/jmicron.c b/drivers/ide/jmicron.c index 74c2c4a6d909..efddd7d9f92d 100644 --- a/drivers/ide/jmicron.c +++ b/drivers/ide/jmicron.c | |||
@@ -102,7 +102,7 @@ static const struct ide_port_ops jmicron_port_ops = { | |||
102 | .cable_detect = jmicron_cable_detect, | 102 | .cable_detect = jmicron_cable_detect, |
103 | }; | 103 | }; |
104 | 104 | ||
105 | static const struct ide_port_info jmicron_chipset __devinitdata = { | 105 | static const struct ide_port_info jmicron_chipset __devinitconst = { |
106 | .name = DRV_NAME, | 106 | .name = DRV_NAME, |
107 | .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } }, | 107 | .enablebits = { { 0x40, 0x01, 0x01 }, { 0x40, 0x10, 0x10 } }, |
108 | .port_ops = &jmicron_port_ops, | 108 | .port_ops = &jmicron_port_ops, |