Commit 474ab45a authored by Randy Dunlap's avatar Randy Dunlap Committed by Linus Torvalds
Browse files

[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: default avatarRandy Dunlap <rdunlap@xenotime.net>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 96ebb928
...@@ -551,7 +551,7 @@ static inline void enable_mmio(void) ...@@ -551,7 +551,7 @@ static inline void enable_mmio(void)
#define crtc_unlock() write3X4(CRTVSyncEnd, read3X4(CRTVSyncEnd) & 0x7F) #define crtc_unlock() write3X4(CRTVSyncEnd, read3X4(CRTVSyncEnd) & 0x7F)
/* Return flat panel's maximum x resolution */ /* Return flat panel's maximum x resolution */
static int __init get_nativex(void) static int __devinit get_nativex(void)
{ {
int x,y,tmp; int x,y,tmp;
...@@ -658,7 +658,7 @@ static void set_number_of_lines(int lines) ...@@ -658,7 +658,7 @@ static void set_number_of_lines(int lines)
* If we see that FP is active we assume we have one. * If we see that FP is active we assume we have one.
* Otherwise we have a CRT display.User can override. * Otherwise we have a CRT display.User can override.
*/ */
static unsigned int __init get_displaytype(void) static unsigned int __devinit get_displaytype(void)
{ {
if (fp) if (fp)
return DISPLAY_FP; return DISPLAY_FP;
...@@ -668,7 +668,7 @@ static unsigned int __init get_displaytype(void) ...@@ -668,7 +668,7 @@ static unsigned int __init get_displaytype(void)
} }
/* Try detecting the video memory size */ /* Try detecting the video memory size */
static unsigned int __init get_memsize(void) static unsigned int __devinit get_memsize(void)
{ {
unsigned char tmp, tmp2; unsigned char tmp, tmp2;
unsigned int k; unsigned int k;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment