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 'drm-next-5.2' of git://people.freedesktop.org/~agd5f/linux into drm...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
mgag200
/
mgag200_drv.h
diff --git
a/drivers/gpu/drm/mgag200/mgag200_drv.h
b/drivers/gpu/drm/mgag200/mgag200_drv.h
index 706c902aad2d16e688ba19c2e44fe5bca6c5312e..8c31e4422cae497fd1218b3604dcdd90032191d8 100644
(file)
--- a/
drivers/gpu/drm/mgag200/mgag200_drv.h
+++ b/
drivers/gpu/drm/mgag200/mgag200_drv.h
@@
-113,7
+113,7
@@
struct mga_framebuffer {
};
struct mga_fbdev {
};
struct mga_fbdev {
- struct drm_fb_helper helper;
+ struct drm_fb_helper helper;
/* must be first */
struct mga_framebuffer mfb;
void *sysram;
int size;
struct mga_framebuffer mfb;
void *sysram;
int size;