rpms/kernel/devel kernel.spec, 1.129, 1.130 linux-2.6-powerpc-generic-suspend-2-remove-adb-sleep-notifier.patch, 1.1, 1.2 linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch, 1.1, 1.2 linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch, 1.1, 1.2

[Dave Jones (davej) <fedora-extras-commits redhat com>]

Author: davej

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

Modified Files:
	kernel.spec 
	linux-2.6-powerpc-generic-suspend-2-remove-adb-sleep-notifier.patch 
	linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch 
	linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch 
Log Message:
fix up powerpc


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- kernel.spec	28 Aug 2007 21:33:11 -0000	1.129
+++ kernel.spec	28 Aug 2007 21:50:58 -0000	1.130
@@ -1017,10 +1017,10 @@
 ApplyPatch linux-2.6-ps3-legacy-bootloader-hack.patch
 #ApplyPatch linux-2.6-powerpc-spu-vicinity.patch
 # Suspend through /sys/power/state
-#ApplyPatch linux-2.6-powerpc-generic-suspend-2-remove-adb-sleep-notifier.patch
-#ApplyPatch linux-2.6-powerpc-generic-suspend-3-remove-dmasound.patch
-#ApplyPatch linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch
-#ApplyPatch linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
+ApplyPatch linux-2.6-powerpc-generic-suspend-2-remove-adb-sleep-notifier.patch
+ApplyPatch linux-2.6-powerpc-generic-suspend-3-remove-dmasound.patch
+ApplyPatch linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch
+ApplyPatch linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch
 
 
 # Exec shield

linux-2.6-powerpc-generic-suspend-2-remove-adb-sleep-notifier.patch:

Index: linux-2.6-powerpc-generic-suspend-2-remove-adb-sleep-notifier.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-powerpc-generic-suspend-2-remove-adb-sleep-notifier.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-powerpc-generic-suspend-2-remove-adb-sleep-notifier.patch	31 Jul 2007 11:33:24 -0000	1.1
+++ linux-2.6-powerpc-generic-suspend-2-remove-adb-sleep-notifier.patch	28 Aug 2007 21:50:58 -0000	1.2
@@ -19,7 +19,7 @@
  static int autopoll_devs;
  int __adb_probe_sync;
  
--#ifdef CONFIG_PM
+-#ifdef CONFIG_PM_SLEEP
 -static void adb_notify_sleep(struct pmu_sleep_notifier *self, int when);
 -static struct pmu_sleep_notifier adb_sleep_notifier = {
 -	adb_notify_sleep,
@@ -67,22 +67,16 @@
  int __init adb_init(void)
  {
  	struct adb_driver *driver;
-@@ -313,14 +335,12 @@ int __init adb_init(void)
+@@ -335,9 +335,6 @@ int __init adb_init(void)
  		printk(KERN_WARNING "Warning: no ADB interface detected\n");
  		adb_controller = NULL;
  	} else {
--#ifdef CONFIG_PM
+-#ifdef CONFIG_PM_SLEEP
 -		pmu_register_sleep_notifier(&adb_sleep_notifier);
 -#endif /* CONFIG_PM */
  #ifdef CONFIG_PPC
  		if (machine_is_compatible("AAPL,PowerBook1998") ||
  			machine_is_compatible("PowerBook1,1"))
- 			sleepy_trackpad = 1;
- #endif /* CONFIG_PPC */
-+
- 		init_completion(&adb_probe_task_comp);
- 		adbdev_init();
- 		adb_reset_bus();
 @@ -330,33 +350,6 @@ int __init adb_init(void)
  
  __initcall(adb_init);

linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch:

Index: linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch	31 Jul 2007 11:33:24 -0000	1.1
+++ linux-2.6-powerpc-generic-suspend-4-kill-pmu-sleep-notifier.patch	28 Aug 2007 21:50:58 -0000	1.2
@@ -20,11 +20,11 @@
  
  #ifdef CONFIG_ADB
  static int adb_dev_map;
-@@ -1738,67 +1737,7 @@ pmu_present(void)
+@@ -1737,67 +1737,8 @@ pmu_present(void)
  	return via != 0;
  }
  
--#ifdef CONFIG_PM
+-#ifdef CONFIG_PM_SLEEP
 -
 -static LIST_HEAD(sleep_notifiers);
 -
@@ -55,10 +55,10 @@
 -	return 0;
 -}
 -EXPORT_SYMBOL(pmu_unregister_sleep_notifier);
--#endif /* CONFIG_PM */
--
- #if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+-#endif /* CONFIG_PM_SLEEP */
 -
+ #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
+ 
 -/* Sleep is broadcast last-to-first */
 -static void broadcast_sleep(int when)
 -{

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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch	31 Jul 2007 11:33:24 -0000	1.1
+++ linux-2.6-powerpc-generic-suspend-5-pmu-pm_ops.patch	28 Aug 2007 21:50:58 -0000	1.2
@@ -26,11 +26,11 @@
  
  #include "via-pmu-event.h"
  
-@@ -155,9 +156,6 @@ static int drop_interrupts;
- #if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+@@ -156,9 +156,6 @@ static int drop_interrupts;
+ #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
  static int option_lid_wakeup = 1;
- #endif /* CONFIG_PM && CONFIG_PPC32 */
--#if (defined(CONFIG_PM)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT_LEGACY)
+ #endif /* CONFIG_PM_SLEEP && CONFIG_PPC32 */
+-#if (defined(CONFIG_PM_SLEEP)&&defined(CONFIG_PPC32))||defined(CONFIG_PMAC_BACKLIGHT_LEGACY)
 -static int sleep_in_progress;
 -#endif
  static unsigned long async_req_locks;
@@ -419,10 +419,10 @@
  static int
  pmu_ioctl(struct inode * inode, struct file *filp,
  		     u_int cmd, u_long arg)
-@@ -2503,29 +2494,19 @@ pmu_ioctl(struct inode * inode, struct f
+@@ -2495,29 +2495,19 @@ pmu_ioctl(struct inode * inode, struct f
  
  	switch (cmd) {
- #if defined(CONFIG_PM) && defined(CONFIG_PPC32)
+ #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_PPC32)
 +	/* just provided for compatibility */
  	case PMU_IOC_SLEEP:
  		if (!capable(CAP_SYS_ADMIN))