aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorRandy Dunlap <rdunlap@xenotime.net>2006-06-25 08:48:38 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-25 13:01:15 -0400
commit474ab45a1f7de888df63da86b46785fe19d7fbe7 (patch)
tree6d3d0d400745abd70c57d88e0af488981550cbe7 /drivers/video
parent96ebb92840b6bbb2e2fd8ad6b2b55d9cd76a06a0 (diff)
[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>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/tridentfb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/tridentfb.c b/drivers/video/tridentfb.c
index 9ac2d3171187..41f8c2d93892 100644
--- a/drivers/video/tridentfb.c
+++ b/drivers/video/tridentfb.c
@@ -551,7 +551,7 @@ static inline void enable_mmio(void)
551#define crtc_unlock() write3X4(CRTVSyncEnd, read3X4(CRTVSyncEnd) & 0x7F) 551#define crtc_unlock() write3X4(CRTVSyncEnd, read3X4(CRTVSyncEnd) & 0x7F)
552 552
553/* Return flat panel's maximum x resolution */ 553/* Return flat panel's maximum x resolution */
554static int __init get_nativex(void) 554static int __devinit get_nativex(void)
555{ 555{
556 int x,y,tmp; 556 int x,y,tmp;
557 557
@@ -658,7 +658,7 @@ static void set_number_of_lines(int lines)
658 * If we see that FP is active we assume we have one. 658 * If we see that FP is active we assume we have one.
659 * Otherwise we have a CRT display.User can override. 659 * Otherwise we have a CRT display.User can override.
660 */ 660 */
661static unsigned int __init get_displaytype(void) 661static unsigned int __devinit get_displaytype(void)
662{ 662{
663 if (fp) 663 if (fp)
664 return DISPLAY_FP; 664 return DISPLAY_FP;
@@ -668,7 +668,7 @@ static unsigned int __init get_displaytype(void)
668} 668}
669 669
670/* Try detecting the video memory size */ 670/* Try detecting the video memory size */
671static unsigned int __init get_memsize(void) 671static unsigned int __devinit get_memsize(void)
672{ 672{
673 unsigned char tmp, tmp2; 673 unsigned char tmp, tmp2;
674 unsigned int k; 674 unsigned int k;