lkml.org 
[lkml]   [2004]   [Aug]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] 2.6.9-rc1 - #ifdef cleanup for PPC
From
Date
Another few #if/#ifdef cleanups, this time for the PPC architecture.

Signed-off-by: valdis.kletnieks@vt.edu

--- linux-2.6.9-rc1/arch/ppc/kernel/process.c.ifdef 2004-08-14 01:36:57.000000000 -0400
+++ linux-2.6.9-rc1/arch/ppc/kernel/process.c 2004-08-24 10:17:03.857097999 -0400
@@ -662,7 +662,7 @@ void show_stack(struct task_struct *tsk,
++count;
sp = *(unsigned long *)sp;
}
-#if !CONFIG_KALLSYMS
+#ifndef CONFIG_KALLSYMS
if (count > 0)
printk("\n");
#endif
--- linux-2.6.9-rc1/arch/ppc/platforms/85xx/mpc85xx_cds_common.c.ifdef 2004-08-14 01:37:42.000000000 -0400
+++ linux-2.6.9-rc1/arch/ppc/platforms/85xx/mpc85xx_cds_common.c 2004-08-24 10:12:15.501717142 -0400
@@ -307,7 +307,7 @@ mpc85xx_exclude_device(u_char bus, u_cha
{
if (bus == 0 && PCI_SLOT(devfn) == 0)
return PCIBIOS_DEVICE_NOT_FOUND;
-#if CONFIG_85xx_PCI2
+#ifdef CONFIG_85xx_PCI2
/* With the current code we know PCI2 will be bus 2, however this may
* not be guarnteed */
if (bus == 2 && PCI_SLOT(devfn) == 0)
--- linux-2.6.9-rc1/arch/ppc/syslib/ppc85xx_setup.c.ifdef 2004-08-14 01:37:41.000000000 -0400
+++ linux-2.6.9-rc1/arch/ppc/syslib/ppc85xx_setup.c 2004-08-24 10:11:16.571016663 -0400
@@ -277,7 +277,7 @@ mpc85xx_setup_hose(void)
hose_a->io_space.start = MPC85XX_PCI1_LOWER_IO;
hose_a->io_space.end = MPC85XX_PCI1_UPPER_IO;
hose_a->io_base_phys = MPC85XX_PCI1_IO_BASE;
-#if CONFIG_85xx_PCI2
+#ifdef CONFIG_85xx_PCI2
isa_io_base =
(unsigned long) ioremap(MPC85XX_PCI1_IO_BASE,
MPC85XX_PCI1_IO_SIZE +
@@ -304,7 +304,7 @@ mpc85xx_setup_hose(void)

hose_a->last_busno = pciauto_bus_scan(hose_a, hose_a->first_busno);

-#if CONFIG_85xx_PCI2
+#ifdef CONFIG_85xx_PCI2
hose_b = pcibios_alloc_controller();

if (!hose_b)

[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2005-03-22 14:05    [W:0.053 / U:0.116 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site