Commit 474ab45a1f7de888df63da86b46785fe19d7fbe7
Committed by
Linus Torvalds
1 parent
96ebb92840
Exists in
master
and in
4 other branches
[PATCH] trident fb section fixes
Priority: not critical. Change 3 functions from __init to __devinit. Could be an init/probe problem in theory, but not observed, so not high priority IMO. Fix section mismatch warnings: WARNING: drivers/video/tridentfb.o - Section mismatch: reference to .init.text: from .text between 'trident_pci_probe' (at offset 0x1aad) and 'trident_pci_remove' WARNING: drivers/video/tridentfb.o - Section mismatch: reference to .init.text: from .text between 'trident_pci_probe' (at offset 0x1b22) and 'trident_pci_remove' WARNING: drivers/video/tridentfb.o - Section mismatch: reference to .init.text: from .text between 'trident_pci_probe' (at offset 0x1b31) and 'trident_pci_remove' Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff
drivers/video/tridentfb.c
| ... | ... | @@ -551,7 +551,7 @@ |
| 551 | 551 | #define crtc_unlock() write3X4(CRTVSyncEnd, read3X4(CRTVSyncEnd) & 0x7F) |
| 552 | 552 | |
| 553 | 553 | /* Return flat panel's maximum x resolution */ |
| 554 | -static int __init get_nativex(void) | |
| 554 | +static int __devinit get_nativex(void) | |
| 555 | 555 | { |
| 556 | 556 | int x,y,tmp; |
| 557 | 557 | |
| ... | ... | @@ -658,7 +658,7 @@ |
| 658 | 658 | * If we see that FP is active we assume we have one. |
| 659 | 659 | * Otherwise we have a CRT display.User can override. |
| 660 | 660 | */ |
| 661 | -static unsigned int __init get_displaytype(void) | |
| 661 | +static unsigned int __devinit get_displaytype(void) | |
| 662 | 662 | { |
| 663 | 663 | if (fp) |
| 664 | 664 | return DISPLAY_FP; |
| ... | ... | @@ -668,7 +668,7 @@ |
| 668 | 668 | } |
| 669 | 669 | |
| 670 | 670 | /* Try detecting the video memory size */ |
| 671 | -static unsigned int __init get_memsize(void) | |
| 671 | +static unsigned int __devinit get_memsize(void) | |
| 672 | 672 | { |
| 673 | 673 | unsigned char tmp, tmp2; |
| 674 | 674 | unsigned int k; |