From: Sascha Hauer <s.hauer@pengutronix.de>
To: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: linuxppc-dev@ozlabs.org
Subject: Re: [patch 01/16] remove inclusion of asm/processor.h for powerpc
Date: Fri, 3 Nov 2006 09:52:49 +0100 [thread overview]
Message-ID: <20061103085249.GC22478@localhost.localdomain> (raw)
In-Reply-To: <1162506020.10630.31.camel@localhost.localdomain>
I Sent a -p0 patch by accident, forget the last one.
There is some PPC_CHRP specific code in drivers/ide/pci/via82cxxx.c,
so #ifdef on CONFIG_PPC_CHRP instead of CONFIG_PPC_MULTIPLATFORM.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Index: drivers/ide/pci/via82cxxx.c
===================================================================
--- a/drivers/ide/pci/via82cxxx.c.orig
+++ b/drivers/ide/pci/via82cxxx.c
@@ -35,7 +35,7 @@
#include <linux/ide.h>
#include <asm/io.h>
-#ifdef CONFIG_PPC_MULTIPLATFORM
+#ifdef CONFIG_PPC_CHRP
#include <asm/processor.h>
#endif
@@ -442,7 +442,7 @@ static void __devinit init_hwif_via82cxx
hwif->speedproc = &via_set_drive;
-#if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32)
+#ifdef CONFIG_PPC_CHRP
if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
hwif->irq = hwif->channel ? 15 : 14;
}
--
Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
Pengutronix - Linux Solutions for Science and Industry
Handelsregister: Amtsgericht Hildesheim, HRA 2686
Hannoversche Str. 2, 31134 Hildesheim, Germany
Phone: +49-5121-206917-0 | Fax: +49-5121-206917-9
next prev parent reply other threads:[~2006-11-03 8:52 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-11-02 12:55 [patch 00/16] powerpc cleanup patches s.hauer
2006-11-02 12:55 ` [patch 01/16] remove inclusion of asm/processor.h for powerpc s.hauer
2006-11-02 22:20 ` Benjamin Herrenschmidt
2006-11-03 8:42 ` Sascha Hauer
2006-11-05 6:46 ` Benjamin Herrenschmidt
2006-11-03 8:52 ` Sascha Hauer [this message]
2006-11-05 6:47 ` Benjamin Herrenschmidt
2006-11-02 12:55 ` [patch 02/16] replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_PMAC in tulip driver s.hauer
2006-11-02 22:20 ` Benjamin Herrenschmidt
2006-11-02 12:55 ` [patch 03/16] powerpc: remove dead Kconfig entries s.hauer
2006-11-02 12:55 ` [patch 04/16] powerpc: remove dead code in iommu.h s.hauer
2006-11-02 22:21 ` Benjamin Herrenschmidt
2006-11-03 8:47 ` Sascha Hauer
2006-11-05 6:47 ` Benjamin Herrenschmidt
2006-11-06 10:19 ` Sascha Hauer
2006-11-02 12:56 ` [patch 05/16] powerpc: remove ifdef s.hauer
2006-11-02 22:22 ` Benjamin Herrenschmidt
2006-11-02 12:56 ` [patch 06/16] powerpc: remove _machine s.hauer
2006-11-02 22:23 ` Benjamin Herrenschmidt
2006-11-02 12:56 ` [patch 07/16] powerpc: move MPC7448HPC2 platform support to platforms/74xx s.hauer
2006-11-02 12:56 ` [patch 08/16] powerpc: remove EMBEDDED6xx Kconfig entry s.hauer
2006-11-02 14:58 ` Grant Likely
2006-11-02 15:25 ` Sascha Hauer
2006-11-02 15:55 ` Grant Likely
2006-11-02 22:13 ` Benjamin Herrenschmidt
2006-11-03 9:12 ` Sascha Hauer
2006-11-02 15:32 ` Stephen Winiecki
2006-11-02 16:00 ` Sascha Hauer
2006-11-02 20:49 ` Stephen Winiecki
2006-11-02 22:30 ` Benjamin Herrenschmidt
2006-11-02 22:25 ` Benjamin Herrenschmidt
2006-11-02 22:32 ` Grant Likely
2006-11-21 15:13 ` Grant Likely
2006-11-02 12:56 ` [patch 09/16] powerpc: remove occurences of PPC_MULTIPLATFORM in head_64.S s.hauer
2006-11-02 12:56 ` [patch 10/16] powerpc: make hash_native_64.o a 64bit-only object s.hauer
2006-11-02 22:31 ` Benjamin Herrenschmidt
2006-11-02 12:56 ` [patch 11/16] powerpc: remove occurences of PPC_MULTIPLATFORM in pci_64.c s.hauer
2006-11-02 22:32 ` Benjamin Herrenschmidt
2006-11-02 12:56 ` [patch 12/16] remove PPC_MULTIPLATFORM in for config MV643XX_ETH s.hauer
2006-11-02 12:56 ` [patch 13/16] powerpc: make prom_init.o dependent on PPC_OF s.hauer
2006-11-02 22:34 ` Benjamin Herrenschmidt
2006-11-03 9:47 ` Sascha Hauer
2006-11-03 20:34 ` Benjamin Herrenschmidt
2006-11-02 12:56 ` [patch 14/16] powerpc: make initialization of OF hooks " s.hauer
2006-11-02 22:35 ` Benjamin Herrenschmidt
2006-11-02 12:56 ` [patch 15/16] powerpc: clean up usage of boot_dev s.hauer
2006-11-02 22:36 ` Benjamin Herrenschmidt
2006-11-02 12:56 ` [patch 16/16] powerpc: make nvram_64.o a 64bit-only object s.hauer
2006-11-02 22:36 ` Benjamin Herrenschmidt
2006-11-16 16:20 ` [patch 00/16] powerpc cleanup patches Sascha Hauer
2006-11-16 22:25 ` Benjamin Herrenschmidt
2006-11-20 22:15 ` Paul Mackerras
2006-11-21 8:18 ` Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061103085249.GC22478@localhost.localdomain \
--to=s.hauer@pengutronix.de \
--cc=benh@kernel.crashing.org \
--cc=linuxppc-dev@ozlabs.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).