diff options
| author | Mike Rapoport <mike.rapoport@gmail.com> | 2015-10-26 09:06:06 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-27 17:04:57 +0900 |
| commit | e359b6a863e19f2eb5519b31658b4a9cc8812a05 (patch) | |
| tree | 12585c49c1c952a59c95e5d42395bd6b89415b6d /drivers/staging/sm750fb/sm750.h | |
| parent | 8ac97f19df35bf5ab663e096279478d4b8e20f6a (diff) | |
staging: sm750fb: merge lynx_share into sm750_dev
Both struct lynx_share and struct sm750_dev reprsent some parts of the
SM750 graphics adapter. There is no point to keep these parts in
different structures.
Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/sm750fb/sm750.h')
| -rw-r--r-- | drivers/staging/sm750fb/sm750.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h index bd36f22a43ed..6002e37c76d2 100644 --- a/drivers/staging/sm750fb/sm750.h +++ b/drivers/staging/sm750fb/sm750.h @@ -71,10 +71,7 @@ struct lynx_accel { }; -/* lynx_share stands for a presentation of two frame buffer - that use one smi adaptor , it is similar to a basic class of C++ -*/ -struct lynx_share { +struct sm750_dev { /* common members */ u16 devid; u8 revid; @@ -83,10 +80,10 @@ struct lynx_share { struct lynx_accel accel; int accel_off; int dual; - int mtrr_off; - struct{ - int vram; - } mtrr; + int mtrr_off; + struct{ + int vram; + } mtrr; /* all smi graphic adaptor got below attributes */ unsigned long vidmem_start; unsigned long vidreg_start; @@ -96,14 +93,6 @@ struct lynx_share { unsigned char __iomem *pvMem; /* locks*/ spinlock_t slock; -}; - -/* - * sm750_dev stands for a presentation of two frame buffer - * that use one sm750 adaptor - */ -struct sm750_dev { - struct lynx_share share; struct init_status initParm; enum sm750_pnltype pnltype; |