git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/swiotlb-0.8.3' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
drivers
/
video
/
gbefb.c
diff --git
a/drivers/video/gbefb.c
b/drivers/video/gbefb.c
index 7d8c55d7fd28a42c5d73a7f9e5f226bd9362a799..ca3355e430bfd18ac5e55897fd4cab633d3772f8 100644
(file)
--- a/
drivers/video/gbefb.c
+++ b/
drivers/video/gbefb.c
@@
-91,10
+91,10
@@
static uint32_t pseudo_palette[16];
static uint32_t gbe_cmap[256];
static int gbe_turned_on; /* 0 turned off, 1 turned on */
static uint32_t gbe_cmap[256];
static int gbe_turned_on; /* 0 turned off, 1 turned on */
-static char *mode_option __initdata = NULL;
+static char *mode_option __
dev
initdata = NULL;
/* default CRT mode */
/* default CRT mode */
-static struct fb_var_screeninfo default_var_CRT __initdata = {
+static struct fb_var_screeninfo default_var_CRT __
dev
initdata = {
/* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */
.xres = 640,
.yres = 480,
/* 640x480, 60 Hz, Non-Interlaced (25.175 MHz dotclock) */
.xres = 640,
.yres = 480,
@@
-125,7
+125,7
@@
static struct fb_var_screeninfo default_var_CRT __initdata = {
};
/* default LCD mode */
};
/* default LCD mode */
-static struct fb_var_screeninfo default_var_LCD __initdata = {
+static struct fb_var_screeninfo default_var_LCD __
dev
initdata = {
/* 1600x1024, 8 bpp */
.xres = 1600,
.yres = 1024,
/* 1600x1024, 8 bpp */
.xres = 1600,
.yres = 1024,
@@
-157,7
+157,7
@@
static struct fb_var_screeninfo default_var_LCD __initdata = {
/* default modedb mode */
/* 640x480, 60 Hz, Non-Interlaced (25.172 MHz dotclock) */
/* default modedb mode */
/* 640x480, 60 Hz, Non-Interlaced (25.172 MHz dotclock) */
-static struct fb_videomode default_mode_CRT __initdata = {
+static struct fb_videomode default_mode_CRT __
dev
initdata = {
.refresh = 60,
.xres = 640,
.yres = 480,
.refresh = 60,
.xres = 640,
.yres = 480,
@@
-172,7
+172,7
@@
static struct fb_videomode default_mode_CRT __initdata = {
.vmode = FB_VMODE_NONINTERLACED,
};
/* 1600x1024 SGI flatpanel 1600sw */
.vmode = FB_VMODE_NONINTERLACED,
};
/* 1600x1024 SGI flatpanel 1600sw */
-static struct fb_videomode default_mode_LCD __initdata = {
+static struct fb_videomode default_mode_LCD __
dev
initdata = {
/* 1600x1024, 8 bpp */
.xres = 1600,
.yres = 1024,
/* 1600x1024, 8 bpp */
.xres = 1600,
.yres = 1024,
@@
-186,8
+186,8
@@
static struct fb_videomode default_mode_LCD __initdata = {
.vmode = FB_VMODE_NONINTERLACED,
};
.vmode = FB_VMODE_NONINTERLACED,
};
-static struct fb_videomode *default_mode __initdata = &default_mode_CRT;
-static struct fb_var_screeninfo *default_var __initdata = &default_var_CRT;
+static struct fb_videomode *default_mode __
dev
initdata = &default_mode_CRT;
+static struct fb_var_screeninfo *default_var __
dev
initdata = &default_var_CRT;
static int flat_panel_enabled = 0;
static int flat_panel_enabled = 0;
@@
-1098,7
+1098,7
@@
static void gbefb_create_sysfs(struct device *dev)
* Initialization
*/
* Initialization
*/
-static int __init gbefb_setup(char *options)
+static int __
dev
init gbefb_setup(char *options)
{
char *this_opt;
{
char *this_opt;