diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-22 14:26:25 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-22 14:26:25 -0400 |
| commit | 3b38f317e529d8396377dafc7d95a1451a151df5 (patch) | |
| tree | 65e80799417c456bdd907b7d80182732be02e5f4 /drivers/video/i810/i810_main.c | |
| parent | 5d25ea7c0c77cbdba1b5f092d60d624e24dfa938 (diff) | |
| parent | 353b28bafd1b962359a866ff263a7fad833d29a1 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/video/i810/i810_main.c')
| -rw-r--r-- | drivers/video/i810/i810_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/i810/i810_main.c b/drivers/video/i810/i810_main.c index 788297e9d59e..44aa2ffff973 100644 --- a/drivers/video/i810/i810_main.c +++ b/drivers/video/i810/i810_main.c | |||
| @@ -76,8 +76,8 @@ | |||
| 76 | * | 76 | * |
| 77 | * Experiment with v_offset to find out which works best for you. | 77 | * Experiment with v_offset to find out which works best for you. |
| 78 | */ | 78 | */ |
| 79 | static u32 v_offset_default __initdata; /* For 32 MiB Aper size, 8 should be the default */ | 79 | static u32 v_offset_default __devinitdata; /* For 32 MiB Aper size, 8 should be the default */ |
| 80 | static u32 voffset __initdata = 0; | 80 | static u32 voffset __devinitdata; |
| 81 | 81 | ||
| 82 | static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor); | 82 | static int i810fb_cursor(struct fb_info *info, struct fb_cursor *cursor); |
| 83 | static int __devinit i810fb_init_pci (struct pci_dev *dev, | 83 | static int __devinit i810fb_init_pci (struct pci_dev *dev, |