From 3e716b2bfe7a907639cefa3bba8c493e60ac530b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 13 Jun 2008 07:21:40 +0000
Subject: - XFdrake:   o ensure we don't drop non-main "Device" (when modifying
 "Options", #41410)

---
 lib/Xconfig/card.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/Xconfig/card.pm')

diff --git a/lib/Xconfig/card.pm b/lib/Xconfig/card.pm
index c972a31..e121339 100644
--- a/lib/Xconfig/card.pm
+++ b/lib/Xconfig/card.pm
@@ -36,7 +36,7 @@ my @xfree4_Drivers = ((arch() =~ /^sparc/ ? qw(sunbw2 suncg14 suncg3 suncg6 sunf
 sub from_raw_X {
     my ($raw_X) = @_;
 
-    my $device = $raw_X->get_device or die "no card configured";
+    my ($device, @cards) = $raw_X->get_devices or die "no card configured";
 
     my $card = {
 	use_DRI_GLX  => eval { any { /dri/ } $raw_X->get_modules },
@@ -45,6 +45,7 @@ sub from_raw_X {
 	if_($device->{Driver} eq 'nvidia',
 	    DriverVersion => 
 	      readlink("$::prefix/etc/alternatives/gl_conf") =~ m!nvidia(.*)/! ? $1 : '97xx'),
+	if_(@cards, cards => \@cards),
     };
     add_to_card__using_Cards($card, $card->{BoardName});
     $card;
-- 
cgit v1.2.1