projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.10-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
video
/
riva
/
rivafb.h
diff --git
a/drivers/video/riva/rivafb.h
b/drivers/video/riva/rivafb.h
index 48ead6d72f24e9906e2dd33937357cce9687aa89..d9f107b704c6296feb52ee2ea83aa2aa11a1b9a4 100644
(file)
--- a/
drivers/video/riva/rivafb.h
+++ b/
drivers/video/riva/rivafb.h
@@
-4,7
+4,6
@@
#include <linux/fb.h>
#include <video/vga.h>
#include <linux/i2c.h>
#include <linux/fb.h>
#include <video/vga.h>
#include <linux/i2c.h>
-#include <linux/i2c-id.h>
#include <linux/i2c-algo-bit.h>
#include "riva_hw.h"
#include <linux/i2c-algo-bit.h>
#include "riva_hw.h"
@@
-61,7
+60,6
@@
struct riva_par {
Bool SecondCRTC;
int FlatPanel;
struct pci_dev *pdev;
Bool SecondCRTC;
int FlatPanel;
struct pci_dev *pdev;
- int bus;
int cursor_reset;
#ifdef CONFIG_MTRR
struct { int vram; int vram_valid; } mtrr;
int cursor_reset;
#ifdef CONFIG_MTRR
struct { int vram; int vram_valid; } mtrr;