SPECS (LINUX_2_6): kernel.spec - dropped vesafb-tng bcond - vesafb...

[adamg]

Author: adamg                        Date: Sun Apr 23 12:13:12 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- dropped vesafb-tng bcond - vesafb-tng can be disabled with 
  'video=vesafb:off' kernel parameter (and other modules will work then)

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1506 -> 1.441.2.1507) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1506 SPECS/kernel.spec:1.441.2.1507
--- SPECS/kernel.spec:1.441.2.1506	Sun Apr 23 11:18:46 2006
+++ SPECS/kernel.spec	Sun Apr 23 14:13:05 2006
@@ -8,7 +8,6 @@
 %bcond_without	up		# don't build UP kernel
 %bcond_without	source		# don't build kernel-source package
 %bcond_without	pcmcia		# don't build pcmcia
-%bcond_with	vesafb_tng	# build with vesafb-tng patch applied (breaks other fb modules)
 
 %bcond_with     preemptive      # build preemptive kernel
 %bcond_with	suspend2	# build software suspend support
@@ -686,10 +685,8 @@
 %patch4 -p1
 
 %ifarch %{ix86}
-%if %{with vesafb_tng}
 %patch5 -p1
 %endif
-%endif
 
 %patch6 -p1
 
@@ -870,9 +867,7 @@
 %endif
 
 	# vesafb-tng
-%if %{with vesafb_tng}
 	cat %{SOURCE44} >> arch/%{_target_base_arch}/defconfig
-%endif
 
 %if %{with grsecurity}
 	cat %{SOURCE45} >> arch/%{_target_base_arch}/defconfig
@@ -1597,6 +1592,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1507  2006/04/23 12:13:05  adamg
+- dropped vesafb-tng bcond - vesafb-tng can be disabled with
+  'video=vesafb:off' kernel parameter (and other modules will work then)
+
 Revision 1.441.2.1506  2006/04/23 09:18:46  pluto
 - disable vesafb_tng module by default.
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1506&r2=1.441.2.1507&f=u