diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2006-11-03 09:52:49 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-11-13 14:44:55 +1100 |
| commit | 74a9d5f1d140adbeadd5ef319f162903090c3b83 (patch) | |
| tree | bdbeef97067a7de3bb42952c317917e2337ccc12 /drivers/ide | |
| parent | 36ca4ba4b9728f3c420a589a3322c2fbd7ec88b7 (diff) | |
| download | linux-74a9d5f1d140adbeadd5ef319f162903090c3b83.tar.gz linux-74a9d5f1d140adbeadd5ef319f162903090c3b83.tar.bz2 linux-74a9d5f1d140adbeadd5ef319f162903090c3b83.zip | |
[PATCH] Remove inclusion of asm/processor.h in via82cxxx.c
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>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/ide')
| -rw-r--r-- | drivers/ide/pci/via82cxxx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c index 2af634d7acf4..eb7ab112c050 100644 --- a/drivers/ide/pci/via82cxxx.c +++ 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_via82cxxx(ide_hwif_t *hwif) 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; } |