Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 52fe116376129b29572f55acc9c73ebd485052c9

Authored by Russell King
1 parent 56f3aeb2c1
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ARM: RiscPC: acornfb: fix section mismatches 

WARNING: drivers/video/built-in.o(.devinit.text+0x38): Section mismatch in reference from the function acornfb_probe() to the function .init.text:acornfb_setup()
The function __devinit acornfb_probe() references
a function __init acornfb_setup().
If acornfb_setup is only used by acornfb_probe then
annotate acornfb_setup with a matching annotation.

WARNING: drivers/video/built-in.o(.devinit.text+0x3c): Section mismatch in reference from the function acornfb_probe() to the function .init.text:acornfb_init_fbinfo()
The function __devinit acornfb_probe() references
a function __init acornfb_init_fbinfo().
If acornfb_init_fbinfo is only used by acornfb_probe then
annotate acornfb_init_fbinfo with a matching annotation.

WARNING: drivers/video/built-in.o(.devinit.text+0x4c0): Section mismatch in reference from the function acornfb_probe() to the (unknown reference) .init.data:(unknown)
The function __devinit acornfb_probe() references
a (unknown reference) __initdata (unknown).
If (unknown) is only used by acornfb_probe then
annotate (unknown) with a matching annotation.

WARNING: drivers/video/built-in.o(.devinit.text+0x4c8): Section mismatch in reference from the function acornfb_probe() to the (unknown reference) .init.data:(unknown)
The function __devinit acornfb_probe() references
a (unknown reference) __initdata (unknown).
If (unknown) is only used by acornfb_probe then
annotate (unknown) with a matching annotation.

WARNING: drivers/video/built-in.o(.devinit.text+0x4cc): Section mismatch in reference from the function acornfb_probe() to the (unknown reference) .init.data:(unknown)
The function __devinit acornfb_probe() references
a (unknown reference) __initdata (unknown).
If (unknown) is only used by acornfb_probe then
annotate (unknown) with a matching annotation.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 1 changed file with 10 additions and 16 deletions Side-by-side Diff

drivers/video/acornfb.c
Diff comments   View file @ 52fe116
... ... @@ -66,7 +66,7 @@
66 66 * have. Allow 1% either way on the nominal for TVs.
67 67 */
68 68 #define NR_MONTYPES 6
69   -static struct fb_monspecs monspecs[NR_MONTYPES] __initdata = {
  69 +static struct fb_monspecs monspecs[NR_MONTYPES] __devinitdata = {
70 70 { /* TV */
71 71 .hfmin = 15469,
72 72 .hfmax = 15781,
... ... @@ -873,7 +873,7 @@
873 873 /*
874 874 * Everything after here is initialisation!!!
875 875 */
876   -static struct fb_videomode modedb[] __initdata = {
  876 +static struct fb_videomode modedb[] __devinitdata = {
877 877 { /* 320x256 @ 50Hz */
878 878 NULL, 50, 320, 256, 125000, 92, 62, 35, 19, 38, 2,
879 879 FB_SYNC_COMP_HIGH_ACT,
... ... @@ -925,8 +925,7 @@
925 925 }
926 926 };
927 927  
928   -static struct fb_videomode __initdata
929   -acornfb_default_mode = {
  928 +static struct fb_videomode acornfb_default_mode __devinitdata = {
930 929 .name = NULL,
931 930 .refresh = 60,
932 931 .xres = 640,
... ... @@ -942,7 +941,7 @@
942 941 .vmode = FB_VMODE_NONINTERLACED
943 942 };
944 943  
945   -static void __init acornfb_init_fbinfo(void)
  944 +static void __devinit acornfb_init_fbinfo(void)
946 945 {
947 946 static int first = 1;
948 947  
... ... @@ -1018,8 +1017,7 @@
1018 1017 * size can optionally be followed by 'M' or 'K' for
1019 1018 * MB or KB respectively.
1020 1019 */
1021   -static void __init
1022   -acornfb_parse_mon(char *opt)
  1020 +static void __devinit acornfb_parse_mon(char *opt)
1023 1021 {
1024 1022 char *p = opt;
1025 1023  
... ... @@ -1066,8 +1064,7 @@
1066 1064 current_par.montype = -1;
1067 1065 }
1068 1066  
1069   -static void __init
1070   -acornfb_parse_montype(char *opt)
  1067 +static void __devinit acornfb_parse_montype(char *opt)
1071 1068 {
1072 1069 current_par.montype = -2;
1073 1070  
... ... @@ -1108,8 +1105,7 @@
1108 1105 }
1109 1106 }
1110 1107  
1111   -static void __init
1112   -acornfb_parse_dram(char *opt)
  1108 +static void __devinit acornfb_parse_dram(char *opt)
1113 1109 {
1114 1110 unsigned int size;
1115 1111  
1116 1112  
... ... @@ -1134,15 +1130,14 @@
1134 1130 static struct options {
1135 1131 char *name;
1136 1132 void (*parse)(char *opt);
1137   -} opt_table[] __initdata = {
  1133 +} opt_table[] __devinitdata = {
1138 1134 { "mon", acornfb_parse_mon },
1139 1135 { "montype", acornfb_parse_montype },
1140 1136 { "dram", acornfb_parse_dram },
1141 1137 { NULL, NULL }
1142 1138 };
1143 1139  
1144   -int __init
1145   -acornfb_setup(char *options)
  1140 +static int __devinit acornfb_setup(char *options)
1146 1141 {
1147 1142 struct options *optp;
1148 1143 char *opt;
... ... @@ -1179,8 +1174,7 @@
1179 1174 * Detect type of monitor connected
1180 1175 * For now, we just assume SVGA
1181 1176 */
1182   -static int __init
1183   -acornfb_detect_monitortype(void)
  1177 +static int __devinit acornfb_detect_monitortype(void)
1184 1178 {
1185 1179 return 4;
1186 1180 }