summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2007-07-17 04:05:28 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-17 10:23:11 -0700
commit623e71b035cb5271028500720b3622ba76db42bb (patch)
tree651cd606c57b1e1322f92e0406d744a2b341da7e /arch
parent317b3c2167f5326a7de30a1abe50c9897da7a0e3 (diff)
downloadop-kernel-dev-623e71b035cb5271028500720b3622ba76db42bb.zip
op-kernel-dev-623e71b035cb5271028500720b3622ba76db42bb.tar.gz
fbcon: allow fbcon to use the primary display driver
Allow fbcon to select the primary display adapter using the fb_is_primary_device() arch-specific helper. If a a primary adapter is detected, fbcon will unbind the old adapter from the VT layer, then rebind using the new adapter. This requires that bind_/unbind_con_driver() be made public. Because this feature may produce unexpected behavior (from the user's POV), this must be explicitly enabled in Kconfig. [akpm@linux-foundation.org: export unbind_con_driver] Signed-off-by: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/i386/video/fbdev.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/i386/video/fbdev.c b/arch/i386/video/fbdev.c
index 7fc712c..48fb38d 100644
--- a/arch/i386/video/fbdev.c
+++ b/arch/i386/video/fbdev.c
@@ -13,13 +13,11 @@
int fb_is_primary_device(struct fb_info *info)
{
- struct device *device;
+ struct device *device = info->device;
struct pci_dev *pci_dev = NULL;
struct resource *res = NULL;
int retval = 0;
- device = info->device;
-
if (device)
pci_dev = to_pci_dev(device);
OpenPOWER on IntegriCloud