SPECS (LINUX_2_6): kernel.spec - fix compilation on non PM capable...

baggins baggins at pld-linux.org
Fri May 5 17:37:23 CEST 2006


Author: baggins                      Date: Fri May  5 15:37:22 2006 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- fix compilation on non PM capable archs

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1528 -> 1.441.2.1529) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1528 SPECS/kernel.spec:1.441.2.1529
--- SPECS/kernel.spec:1.441.2.1528	Fri May  5 17:29:14 2006
+++ SPECS/kernel.spec	Fri May  5 17:37:17 2006
@@ -237,6 +237,8 @@
 # Derived from http://www.skd.de/e_en/products/adapters/pci_64/sk-98xx_v20/software/linux/driver/install-8_31.tar.bz2
 Patch60:	linux-2.6-sk98lin-8.31.2.3.patch
 
+Patch70:	linux-2.6-suspend2-avoid-redef.patch
+
 # vserver from: http://vserver.13thfloor.at/Experimental/patch-2.6.16-vs2.1.1-rc15.diff
 Patch100:	linux-2.6-vs2.1.patch
 Patch101:	linux-2.6-vs2.1-suspend2.patch
@@ -674,6 +676,7 @@
 for i in suspend2-%{suspend_version}-for-2.6.16.9/[0-9]*; do
 patch -p1 -s < $i
 done
+%patch70 -p1
 
 # reiserfs4
 %{__gzip} -dc %{SOURCE12} | %{__patch} -s -p1
@@ -1584,6 +1587,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1529  2006/05/05 15:37:17  baggins
+- fix compilation on non PM capable archs
+
 Revision 1.441.2.1528  2006/05/05 15:29:14  baggins
 - resolved suspend2/vserver problem of missing definitions
 
================================================================

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



More information about the pld-cvs-commit mailing list