~hc/RK356X_SDK_RELEASE.git

..	..	@@ -202,11 +202,7 @@
202	202	static int forceCRTC = -1;
203	203	static bool noaccel = 0;
204	204	static bool nomtrr = 0;
205		-#ifdef CONFIG_PMAC_BACKLIGHT
206		-static int backlight = 1;
207		-#else
208		-static int backlight = 0;
209		-#endif
	205	+static int backlight = IS_BUILTIN(CONFIG_PMAC_BACKLIGHT);
210	206
211	207	static char *mode_option = NULL;
212	208	static bool strictmode = 0;
..	..	@@ -1100,7 +1096,7 @@
1100	1096	break;
1101	1097	case 9 ... 15:
1102	1098	var->green.length = 5;
1103		- /* fall through */
	1099	+ fallthrough;
1104	1100	case 16:
1105	1101	var->bits_per_pixel = 16;
1106	1102	/* The Riva128 supports RGB555 only */
..	..	@@ -1676,7 +1672,7 @@
1676	1672	* ------------------------------------------------------------------------- */
1677	1673
1678	1674	/* kernel interface */
1679		-static struct fb_ops riva_fb_ops = {
	1675	+static const struct fb_ops riva_fb_ops = {
1680	1676	.owner = THIS_MODULE,
1681	1677	.fb_open = rivafb_open,
1682	1678	.fb_release = rivafb_release,
..	..	@@ -1905,7 +1901,6 @@
1905	1901
1906	1902	info = framebuffer_alloc(sizeof(struct riva_par), &pd->dev);
1907	1903	if (!info) {
1908		- printk (KERN_ERR PFX "could not allocate memory\n");
1909	1904	ret = -ENOMEM;
1910	1905	goto err_ret;
1911	1906	}