git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
video
/
riva
/
rivafb.h
diff --git
a/drivers/video/riva/rivafb.h
b/drivers/video/riva/rivafb.h
index
198a29c
..
7fa13fc
100644
(file)
--- a/
drivers/video/riva/rivafb.h
+++ b/
drivers/video/riva/rivafb.h
@@
-1,7
+1,6
@@
#ifndef __RIVAFB_H
#define __RIVAFB_H
#ifndef __RIVAFB_H
#define __RIVAFB_H
-#include <linux/config.h>
#include <linux/fb.h>
#include <video/vga.h>
#include <linux/i2c.h>
#include <linux/fb.h>
#include <video/vga.h>
#include <linux/i2c.h>
@@
-44,16
+43,17
@@
struct riva_i2c_chan {
struct riva_par {
RIVA_HW_INST riva; /* interface to riva_hw.c */
struct riva_par {
RIVA_HW_INST riva; /* interface to riva_hw.c */
-
- caddr_t ctrl_base; /* virtual control register base addr */
+ u32 pseudo_palette[16]; /* default palette */
+ u32 palette[16]; /* for Riva128 */
+ u8 __iomem *ctrl_base; /* virtual control register base addr */
unsigned dclk_max; /* max DCLK */
struct riva_regs initial_state; /* initial startup video mode */
struct riva_regs current_state;
unsigned dclk_max; /* max DCLK */
struct riva_regs initial_state; /* initial startup video mode */
struct riva_regs current_state;
+#ifdef CONFIG_X86
struct vgastate state;
struct vgastate state;
+#endif
atomic_t ref_count;
atomic_t ref_count;
- u32 cursor_data[32 * 32/4];
- int cursor_reset;
unsigned char *EDID;
unsigned int Chipset;
int forceCRTC;
unsigned char *EDID;
unsigned int Chipset;
int forceCRTC;
@@
-61,6
+61,7
@@
struct riva_par {
int FlatPanel;
struct pci_dev *pdev;
int bus;
int FlatPanel;
struct pci_dev *pdev;
int bus;
+ int cursor_reset;
#ifdef CONFIG_MTRR
struct { int vram; int vram_valid; } mtrr;
#endif
#ifdef CONFIG_MTRR
struct { int vram; int vram_valid; } mtrr;
#endif