diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 09:00:30 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 09:00:30 -0700 |
| commit | 5c8e191e8437616a498a8e1cc0af3dd0d32bbff2 (patch) | |
| tree | 78ed04467e3bd034eaa9696cdf8d668ba7e16381 /drivers/video/intelfb | |
| parent | cbfee34520666862f8ff539e580c48958fbb7706 (diff) | |
| parent | 3ea335100014785fd2518461705654b200e58d00 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
Remove magic macros for screen_info structure members
[x86] remove uses of magic macros for boot_params access
Diffstat (limited to 'drivers/video/intelfb')
| -rw-r--r-- | drivers/video/intelfb/intelfbdrv.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c index 0428f211f192..e8e38edb9b5b 100644 --- a/drivers/video/intelfb/intelfbdrv.c +++ b/drivers/video/intelfb/intelfbdrv.c @@ -804,7 +804,8 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev, if (bailearly == 1) bailout(dinfo); - if (FIXED_MODE(dinfo) && ORIG_VIDEO_ISVGA != VIDEO_TYPE_VLFB) { + if (FIXED_MODE(dinfo) && + screen_info.orig_video_isVGA != VIDEO_TYPE_VLFB) { ERR_MSG("Video mode must be programmed at boot time.\n"); cleanup(dinfo); return -ENODEV; @@ -815,7 +816,7 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev, /* Initialise dinfo and related data. */ /* If an initial mode was programmed at boot time, get its details. */ - if (ORIG_VIDEO_ISVGA == VIDEO_TYPE_VLFB) + if (screen_info.orig_video_isVGA == VIDEO_TYPE_VLFB) get_initial_mode(dinfo); if (bailearly == 3) |