diff options
author | Andi Kleen <ak@linux.intel.com> | 2012-10-04 20:11:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-05 14:04:42 -0400 |
commit | 19afa16f973c1f75bf3a7e70a0f79bcd7232f2b7 (patch) | |
tree | cc7a0f54b23d05b5aac8caef8e67cc12bd1e149d /drivers/mfd | |
parent | dd0e981a6cc855a785e43d743c399196c144cdd6 (diff) |
sections: fix section conflicts in drivers/mfd
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Samuel Ortiz <sameo@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/wm8994-core.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c index 2febf88cfce8..dd8dfbee39ec 100644 --- a/drivers/mfd/wm8994-core.c +++ b/drivers/mfd/wm8994-core.c | |||
@@ -374,21 +374,21 @@ static int wm8994_ldo_in_use(struct wm8994_pdata *pdata, int ldo) | |||
374 | } | 374 | } |
375 | #endif | 375 | #endif |
376 | 376 | ||
377 | static const __devinitdata struct reg_default wm8994_revc_patch[] = { | 377 | static const __devinitconst struct reg_default wm8994_revc_patch[] = { |
378 | { 0x102, 0x3 }, | 378 | { 0x102, 0x3 }, |
379 | { 0x56, 0x3 }, | 379 | { 0x56, 0x3 }, |
380 | { 0x817, 0x0 }, | 380 | { 0x817, 0x0 }, |
381 | { 0x102, 0x0 }, | 381 | { 0x102, 0x0 }, |
382 | }; | 382 | }; |
383 | 383 | ||
384 | static const __devinitdata struct reg_default wm8958_reva_patch[] = { | 384 | static const __devinitconst struct reg_default wm8958_reva_patch[] = { |
385 | { 0x102, 0x3 }, | 385 | { 0x102, 0x3 }, |
386 | { 0xcb, 0x81 }, | 386 | { 0xcb, 0x81 }, |
387 | { 0x817, 0x0 }, | 387 | { 0x817, 0x0 }, |
388 | { 0x102, 0x0 }, | 388 | { 0x102, 0x0 }, |
389 | }; | 389 | }; |
390 | 390 | ||
391 | static const __devinitdata struct reg_default wm1811_reva_patch[] = { | 391 | static const __devinitconst struct reg_default wm1811_reva_patch[] = { |
392 | { 0x102, 0x3 }, | 392 | { 0x102, 0x3 }, |
393 | { 0x56, 0x7 }, | 393 | { 0x56, 0x7 }, |
394 | { 0x5d, 0x7e }, | 394 | { 0x5d, 0x7e }, |