Commit 474ab45a authored Jun 25, 2006 by Randy Dunlap Committed by Linus Torvalds Jun 25, 2006

[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>

parent 96ebb928

drivers/video/tridentfb.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -551,7 +551,7 @@ static inline void enable_mmio(void)
		#define crtc_unlock() write3X4(CRTVSyncEnd, read3X4(CRTVSyncEnd) & 0x7F)

		/* Return flat panel's maximum x resolution */
		static int __init get_nativex(void)
		static int __devinit get_nativex(void)
		{
		int x,y,tmp;

		@@ -658,7 +658,7 @@ static void set_number_of_lines(int lines)
		* If we see that FP is active we assume we have one.
		* 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)
		return DISPLAY_FP;
		@@ -668,7 +668,7 @@ static unsigned int __init get_displaytype(void)
		}

		/* 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 int k;