rpms/kernel/devel linux-2.6-compile-fixes.patch, 1.159, 1.160 linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch, 1.3, 1.4

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2086

Modified Files:
	linux-2.6-compile-fixes.patch 
	linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch 
Log Message:
fold into the patch responsible for causing the fail

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- linux-2.6-compile-fixes.patch	7 Nov 2007 21:55:57 -0000	1.159
+++ linux-2.6-compile-fixes.patch	14 Dec 2007 03:14:09 -0000	1.160
@@ -5,30 +5,3 @@
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
 
-
-drivers/macintosh/via-pmu.c: In function 'register_pmu_pm_ops':
-drivers/macintosh/via-pmu.c:2481: error: implicit declaration of function 'pm_set_ops'
-
-Signed-off-by Dave Jones <davej at redhat.com>
-
---- linux-2.6.23.noarch/drivers/macintosh/via-pmu.c~	2007-11-07 16:54:46.000000000 -0500
-+++ linux-2.6.23.noarch/drivers/macintosh/via-pmu.c	2007-11-07 16:55:02.000000000 -0500
-@@ -2469,7 +2469,7 @@ static int pmu_sleep_valid(suspend_state
- 		&& (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
- }
- 
--static struct pm_ops pmu_pm_ops = {
-+static struct platform_suspend_ops pmu_pm_ops = {
- 	.prepare = powerbook_prepare_sleep,
- 	.enter = powerbook_sleep,
- 	.finish = powerbook_finish_sleep,
-@@ -2478,7 +2478,7 @@ static struct pm_ops pmu_pm_ops = {
- 
- static int register_pmu_pm_ops(void)
- {
--	pm_set_ops(&pmu_pm_ops);
-+	suspend_set_ops(&pmu_pm_ops);
- 
- 	return 0;
- }
-

linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch:

Index: linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch	29 Aug 2007 01:17:07 -0000	1.3
+++ linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch	14 Dec 2007 03:14:09 -0000	1.4
@@ -493,3 +493,37 @@
 +Who:	Johannes Berg <johannes at sipsolutions.net>
 +
 +---------------------------
+#
+# Small compile fixes (For more involved fixes, please use a separate patch).
+#
+# Please add the errors from gcc before the diffs to save others having
+# to do a compile to figure out what your diff is fixing. Thanks.
+#
+
+
+drivers/macintosh/via-pmu.c: In function 'register_pmu_pm_ops':
+drivers/macintosh/via-pmu.c:2481: error: implicit declaration of function 'pm_set_ops'
+
+Signed-off-by Dave Jones <davej at redhat.com>
+
+--- linux-2.6.23.noarch/drivers/macintosh/via-pmu.c~	2007-11-07 16:54:46.000000000 -0500
++++ linux-2.6.23.noarch/drivers/macintosh/via-pmu.c	2007-11-07 16:55:02.000000000 -0500
+@@ -2469,7 +2469,7 @@ static int pmu_sleep_valid(suspend_state
+ 		&& (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
+ }
+ 
+-static struct pm_ops pmu_pm_ops = {
++static struct platform_suspend_ops pmu_pm_ops = {
+ 	.prepare = powerbook_prepare_sleep,
+ 	.enter = powerbook_sleep,
+ 	.finish = powerbook_finish_sleep,
+@@ -2478,7 +2478,7 @@ static struct pm_ops pmu_pm_ops = {
+ 
+ static int register_pmu_pm_ops(void)
+ {
+-	pm_set_ops(&pmu_pm_ops);
++	suspend_set_ops(&pmu_pm_ops);
+ 
+ 	return 0;
+ }
+