aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2007-05-27 12:10:25 -0400
committerKyle McMartin <kyle@athena.road.mcmartin.ca>2007-05-27 12:14:53 -0400
commit48a7d5c66b3cecc40364d62cfd54c502c0979561 (patch)
tree514ca51c78cca2359b90a47f5538bb4cb427a78f /drivers/video
parent649f0edd8b8ec0c0344fc36dd3f1c0add4497dc8 (diff)
[PARISC] fix section mismatch in parisc STI video drivers
Hi Kyle, this patch fixes various section mismatches in the sti graphics driver: WARNING: drivers/built-in.o(.text.sticore_pci_init+0xac): Section mismatch: reference to .init.text:sti_try_rom_generic (after 'sticore_pci_init') WARNING: drivers/built-in.o(.text.sticore_pci_init+0xe4): Section mismatch: reference to .init.text:sticore_check_for_default_sti (after 'sticore_pci_init') WARNING: drivers/built-in.o(.text.sti_get_rom+0x18): Section mismatch: reference to .init.text:sti_init_roms (after 'sti_get_rom') (and others). Basically it's a replacement of __init by __devinit. Please apply, Helge Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/console/sticore.c50
1 files changed, 25 insertions, 25 deletions
diff --git a/drivers/video/console/sticore.c b/drivers/video/console/sticore.c
index 717b360d0415..870017d44970 100644
--- a/drivers/video/console/sticore.c
+++ b/drivers/video/console/sticore.c
@@ -240,7 +240,7 @@ static void sti_flush(unsigned long from, unsigned long len)
240 flush_icache_range(from, from+len); 240 flush_icache_range(from, from+len);
241} 241}
242 242
243void __init 243void __devinit
244sti_rom_copy(unsigned long base, unsigned long count, void *dest) 244sti_rom_copy(unsigned long base, unsigned long count, void *dest)
245{ 245{
246 unsigned long dest_len = count; 246 unsigned long dest_len = count;
@@ -269,7 +269,7 @@ sti_rom_copy(unsigned long base, unsigned long count, void *dest)
269static char default_sti_path[21] __read_mostly; 269static char default_sti_path[21] __read_mostly;
270 270
271#ifndef MODULE 271#ifndef MODULE
272static int __init sti_setup(char *str) 272static int __devinit sti_setup(char *str)
273{ 273{
274 if (str) 274 if (str)
275 strlcpy (default_sti_path, str, sizeof (default_sti_path)); 275 strlcpy (default_sti_path, str, sizeof (default_sti_path));
@@ -288,12 +288,12 @@ __setup("sti=", sti_setup);
288 288
289 289
290 290
291static char __initdata *font_name[MAX_STI_ROMS] = { "VGA8x16", }; 291static char __devinitdata *font_name[MAX_STI_ROMS] = { "VGA8x16", };
292static int __initdata font_index[MAX_STI_ROMS], 292static int __devinitdata font_index[MAX_STI_ROMS],
293 font_height[MAX_STI_ROMS], 293 font_height[MAX_STI_ROMS],
294 font_width[MAX_STI_ROMS]; 294 font_width[MAX_STI_ROMS];
295#ifndef MODULE 295#ifndef MODULE
296static int __init sti_font_setup(char *str) 296static int __devinit sti_font_setup(char *str)
297{ 297{
298 char *x; 298 char *x;
299 int i = 0; 299 int i = 0;
@@ -346,7 +346,7 @@ __setup("sti_font=", sti_font_setup);
346 346
347 347
348 348
349static void __init 349static void __devinit
350sti_dump_globcfg(struct sti_glob_cfg *glob_cfg, unsigned int sti_mem_request) 350sti_dump_globcfg(struct sti_glob_cfg *glob_cfg, unsigned int sti_mem_request)
351{ 351{
352 struct sti_glob_cfg_ext *cfg; 352 struct sti_glob_cfg_ext *cfg;
@@ -386,7 +386,7 @@ sti_dump_globcfg(struct sti_glob_cfg *glob_cfg, unsigned int sti_mem_request)
386 cfg->sti_mem_addr, sti_mem_request)); 386 cfg->sti_mem_addr, sti_mem_request));
387} 387}
388 388
389static void __init 389static void __devinit
390sti_dump_outptr(struct sti_struct *sti) 390sti_dump_outptr(struct sti_struct *sti)
391{ 391{
392 DPRINTK((KERN_INFO 392 DPRINTK((KERN_INFO
@@ -400,7 +400,7 @@ sti_dump_outptr(struct sti_struct *sti)
400 sti->outptr.attributes)); 400 sti->outptr.attributes));
401} 401}
402 402
403static int __init 403static int __devinit
404sti_init_glob_cfg(struct sti_struct *sti, 404sti_init_glob_cfg(struct sti_struct *sti,
405 unsigned long rom_address, unsigned long hpa) 405 unsigned long rom_address, unsigned long hpa)
406{ 406{
@@ -482,7 +482,7 @@ sti_init_glob_cfg(struct sti_struct *sti,
482} 482}
483 483
484#ifdef CONFIG_FB 484#ifdef CONFIG_FB
485struct sti_cooked_font * __init 485struct sti_cooked_font * __devinit
486sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name) 486sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
487{ 487{
488 const struct font_desc *fbfont; 488 const struct font_desc *fbfont;
@@ -538,14 +538,14 @@ sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
538 return cooked_font; 538 return cooked_font;
539} 539}
540#else 540#else
541struct sti_cooked_font * __init 541struct sti_cooked_font * __devinit
542sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name) 542sti_select_fbfont(struct sti_cooked_rom *cooked_rom, const char *fbfont_name)
543{ 543{
544 return NULL; 544 return NULL;
545} 545}
546#endif 546#endif
547 547
548struct sti_cooked_font * __init 548struct sti_cooked_font * __devinit
549sti_select_font(struct sti_cooked_rom *rom, 549sti_select_font(struct sti_cooked_rom *rom,
550 int (*search_font_fnc) (struct sti_cooked_rom *,int,int) ) 550 int (*search_font_fnc) (struct sti_cooked_rom *,int,int) )
551{ 551{
@@ -572,7 +572,7 @@ sti_select_font(struct sti_cooked_rom *rom,
572} 572}
573 573
574 574
575static void __init 575static void __devinit
576sti_dump_rom(struct sti_rom *rom) 576sti_dump_rom(struct sti_rom *rom)
577{ 577{
578 printk(KERN_INFO " id %04x-%04x, conforms to spec rev. %d.%02x\n", 578 printk(KERN_INFO " id %04x-%04x, conforms to spec rev. %d.%02x\n",
@@ -590,7 +590,7 @@ sti_dump_rom(struct sti_rom *rom)
590} 590}
591 591
592 592
593static int __init 593static int __devinit
594sti_cook_fonts(struct sti_cooked_rom *cooked_rom, 594sti_cook_fonts(struct sti_cooked_rom *cooked_rom,
595 struct sti_rom *raw_rom) 595 struct sti_rom *raw_rom)
596{ 596{
@@ -625,7 +625,7 @@ sti_cook_fonts(struct sti_cooked_rom *cooked_rom,
625} 625}
626 626
627 627
628static int __init 628static int __devinit
629sti_search_font(struct sti_cooked_rom *rom, int height, int width) 629sti_search_font(struct sti_cooked_rom *rom, int height, int width)
630{ 630{
631 struct sti_cooked_font *font; 631 struct sti_cooked_font *font;
@@ -642,7 +642,7 @@ sti_search_font(struct sti_cooked_rom *rom, int height, int width)
642#define BMODE_RELOCATE(offset) offset = (offset) / 4; 642#define BMODE_RELOCATE(offset) offset = (offset) / 4;
643#define BMODE_LAST_ADDR_OFFS 0x50 643#define BMODE_LAST_ADDR_OFFS 0x50
644 644
645static void * __init 645static void * __devinit
646sti_bmode_font_raw(struct sti_cooked_font *f) 646sti_bmode_font_raw(struct sti_cooked_font *f)
647{ 647{
648 unsigned char *n, *p, *q; 648 unsigned char *n, *p, *q;
@@ -660,7 +660,7 @@ sti_bmode_font_raw(struct sti_cooked_font *f)
660 return n + 3; 660 return n + 3;
661} 661}
662 662
663static void __init 663static void __devinit
664sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest) 664sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest)
665{ 665{
666 unsigned long dest_len = count; 666 unsigned long dest_len = count;
@@ -675,7 +675,7 @@ sti_bmode_rom_copy(unsigned long base, unsigned long count, void *dest)
675 sti_flush(dest_start, dest_len); 675 sti_flush(dest_start, dest_len);
676} 676}
677 677
678static struct sti_rom * __init 678static struct sti_rom * __devinit
679sti_get_bmode_rom (unsigned long address) 679sti_get_bmode_rom (unsigned long address)
680{ 680{
681 struct sti_rom *raw; 681 struct sti_rom *raw;
@@ -711,7 +711,7 @@ sti_get_bmode_rom (unsigned long address)
711 return raw; 711 return raw;
712} 712}
713 713
714struct sti_rom * __init 714struct sti_rom * __devinit
715sti_get_wmode_rom (unsigned long address) 715sti_get_wmode_rom (unsigned long address)
716{ 716{
717 struct sti_rom *raw; 717 struct sti_rom *raw;
@@ -727,7 +727,7 @@ sti_get_wmode_rom (unsigned long address)
727 return raw; 727 return raw;
728} 728}
729 729
730int __init 730int __devinit
731sti_read_rom(int wordmode, struct sti_struct *sti, unsigned long address) 731sti_read_rom(int wordmode, struct sti_struct *sti, unsigned long address)
732{ 732{
733 struct sti_cooked_rom *cooked; 733 struct sti_cooked_rom *cooked;
@@ -783,7 +783,7 @@ out_err:
783 return 0; 783 return 0;
784} 784}
785 785
786static struct sti_struct * __init 786static struct sti_struct * __devinit
787sti_try_rom_generic(unsigned long address, unsigned long hpa, struct pci_dev *pd) 787sti_try_rom_generic(unsigned long address, unsigned long hpa, struct pci_dev *pd)
788{ 788{
789 struct sti_struct *sti; 789 struct sti_struct *sti;
@@ -898,7 +898,7 @@ out_err:
898 return NULL; 898 return NULL;
899} 899}
900 900
901static void __init sticore_check_for_default_sti(struct sti_struct *sti, char *path) 901static void __devinit sticore_check_for_default_sti(struct sti_struct *sti, char *path)
902{ 902{
903 if (strcmp (path, default_sti_path) == 0) 903 if (strcmp (path, default_sti_path) == 0)
904 default_sti = sti; 904 default_sti = sti;
@@ -909,7 +909,7 @@ static void __init sticore_check_for_default_sti(struct sti_struct *sti, char *p
909 * in the additional address field addr[1] while on 909 * in the additional address field addr[1] while on
910 * older Systems the PDC stores it in page0->proc_sti 910 * older Systems the PDC stores it in page0->proc_sti
911 */ 911 */
912static int __init sticore_pa_init(struct parisc_device *dev) 912static int __devinit sticore_pa_init(struct parisc_device *dev)
913{ 913{
914 char pa_path[21]; 914 char pa_path[21];
915 struct sti_struct *sti = NULL; 915 struct sti_struct *sti = NULL;
@@ -1015,7 +1015,7 @@ static struct parisc_driver pa_sti_driver = {
1015 1015
1016static int sticore_initialized __read_mostly; 1016static int sticore_initialized __read_mostly;
1017 1017
1018static void __init sti_init_roms(void) 1018static void __devinit sti_init_roms(void)
1019{ 1019{
1020 if (sticore_initialized) 1020 if (sticore_initialized)
1021 return; 1021 return;