From 623e71b035cb5271028500720b3622ba76db42bb Mon Sep 17 00:00:00 2001 From: "Antonino A. Daplas" Date: Tue, 17 Jul 2007 04:05:28 -0700 Subject: 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 Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/i386/video/fbdev.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'arch/i386/video') diff --git a/arch/i386/video/fbdev.c b/arch/i386/video/fbdev.c index 7fc712c46a6..48fb38d7d2c 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); -- cgit v1.2.3