Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Andi Kleen and committed by
Linus Torvalds
19afa16f dd0e981a

+3 -3
+3 -3
drivers/mfd/wm8994-core.c
··· 374 374 } 375 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 378 { 0x102, 0x3 }, 379 379 { 0x56, 0x3 }, 380 380 { 0x817, 0x0 }, 381 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 385 { 0x102, 0x3 }, 386 386 { 0xcb, 0x81 }, 387 387 { 0x817, 0x0 }, 388 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 392 { 0x102, 0x3 }, 393 393 { 0x56, 0x7 }, 394 394 { 0x5d, 0x7e },