]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/blobdiff - src/patches/suse-2.6.27.31/patches.arch/ppc-ipic-suspend-without-83xx-fix
Revert "Move xen patchset to new version's subdir."
[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.arch / ppc-ipic-suspend-without-83xx-fix
diff --git a/src/patches/suse-2.6.27.31/patches.arch/ppc-ipic-suspend-without-83xx-fix b/src/patches/suse-2.6.27.31/patches.arch/ppc-ipic-suspend-without-83xx-fix
deleted file mode 100644 (file)
index 6df2777..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Takashi Iwai <tiwai@suse.de>
-Subject: [PATCH] Fix build_error without CONFIG_PPC_83xx
-Patch-mainline: 
-References: 
-
-fsl_deep_sleep() is defined only with CONFIG_PPC_83xx although
-CONFIG_IPIC is set for CONFIG_PPC_MPC512x, too.
-
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-
----
----
- arch/powerpc/sysdev/ipic.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/arch/powerpc/sysdev/ipic.c
-+++ b/arch/powerpc/sysdev/ipic.c
-@@ -920,6 +920,7 @@ static int ipic_suspend(struct sys_devic
-       ipic_saved_state.sermr = ipic_read(ipic->regs, IPIC_SERMR);
-       ipic_saved_state.sercr = ipic_read(ipic->regs, IPIC_SERCR);
-+#ifdef CONFIG_PPC_83xx
-       if (fsl_deep_sleep()) {
-               /* In deep sleep, make sure there can be no
-                * pending interrupts, as this can cause
-@@ -930,6 +931,7 @@ static int ipic_suspend(struct sys_devic
-               ipic_write(ipic->regs, IPIC_SEMSR, 0);
-               ipic_write(ipic->regs, IPIC_SERMR, 0);
-       }
-+#endif
-       return 0;
- }