From fabeb39b5ef13fd2d4796cc5072b009295c2d430 Mon Sep 17 00:00:00 2001 From: Anssi Hannula Date: Thu, 5 Apr 2012 02:49:52 +0000 Subject: Fix firmware handling (it is DRIVER which needs it, not DRIVER2) --- lib/Xconfig/proprietary.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/Xconfig/proprietary.pm') diff --git a/lib/Xconfig/proprietary.pm b/lib/Xconfig/proprietary.pm index f4fb0c4..7b40a6b 100644 --- a/lib/Xconfig/proprietary.pm +++ b/lib/Xconfig/proprietary.pm @@ -53,12 +53,12 @@ sub handle_FIRMWARE { my $pkg = $card->{FIRMWARE} or return; $do_pkgs->is_installed($pkg) || $do_pkgs->install($pkg) and return; + if ($card->{DRIVER_NO_FIRMWARE}) { + log::l("$card->{Driver} need a firmware to work, switching back to $card->{DRIVER_NO_FIRMWARE}"); + $card->{Driver} = $card->{DRIVER_NO_FIRMWARE}; - if ($card->{DRIVER2_NO_FIRMWARE}) { - log::l("$card->{Driver2} need a firmware to work, switching back to $card->{DRIVER2_NO_FIRMWARE}"); - $card->{Driver2} = $card->{DRIVER2_NO_FIRMWARE}; } else { - log::l("$card->{Driver2} needs a firmware to work smoothly/better (eg: 3D, KMS) but will still work"); + log::l("$card->{Driver} needs a firmware to work smoothly/better (eg: 3D, KMS) but will still work"); } } -- cgit v1.2.1