diff options
| author | Mike Rapoport <mike.rapoport@gmail.com> | 2015-10-26 09:05:57 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-27 17:04:57 +0900 |
| commit | 1757d106a9ce8cc299ffbc3cb87711ab72f95af6 (patch) | |
| tree | 6fa07f6f7e688d0e43eee957b0f66fd179c55933 /drivers/staging/sm750fb/sm750.h | |
| parent | 5ef2f688578c5de8231ae325f5dff8cfe970d2da (diff) | |
| download | op-kernel-dev-1757d106a9ce8cc299ffbc3cb87711ab72f95af6.zip op-kernel-dev-1757d106a9ce8cc299ffbc3cb87711ab72f95af6.tar.gz | |
staging: sm750fb: merge struct sm750_state into struct sm750_dev
The struct sm750_state is never used on its own. Merge it into the
struct sm750_dev.
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 | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/drivers/staging/sm750fb/sm750.h b/drivers/staging/sm750fb/sm750.h index dd175be..248fc3a 100644 --- a/drivers/staging/sm750fb/sm750.h +++ b/drivers/staging/sm750fb/sm750.h @@ -47,15 +47,6 @@ struct init_status { ushort resetMemory; }; -struct sm750_state { - struct init_status initParm; - enum sm750_pnltype pnltype; - enum sm750_dataflow dataflow; - int nocrt; - int xLCD; - int yLCD; -}; - struct lynx_accel { /* base virtual address of DPR registers */ volatile unsigned char __iomem *dprBase; @@ -113,7 +104,13 @@ struct lynx_share { */ struct sm750_dev { struct lynx_share share; - struct sm750_state state; + + struct init_status initParm; + enum sm750_pnltype pnltype; + enum sm750_dataflow dataflow; + int nocrt; + int xLCD; + int yLCD; /* * 0: no hardware cursor |
