Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dfaa762 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Kumar Gala
Browse files

[POWERPC] kill isa_{io,mem}_base definitions for !PCI 



When CONFIG_PCI is disabled, the definitions for isa_io_base,
isa_mem_base and pci_dram_offset are entirely unused, but they
can result in link failure because they are defined in multiple
places.

The easiest fix is to just remove all these definitions.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 14305601

arch/powerpc/platforms/83xx/mpc8313_rdb.c

+0 −5
Original line number Diff line number Diff line
@@ -28,11 +28,6 @@ 
#define DBG(fmt...)

#endif



#ifndef CONFIG_PCI

unsigned long isa_io_base = 0;

unsigned long isa_mem_base = 0;

#endif



/* ************************************************************************

 *

 * Setup the architecture

arch/powerpc/platforms/83xx/mpc832x_mds.c

+0 −5
Original line number Diff line number Diff line
@@ -49,11 +49,6 @@ 
#define DBG(fmt...)

#endif



#ifndef CONFIG_PCI

unsigned long isa_io_base = 0;

unsigned long isa_mem_base = 0;

#endif



static u8 *bcsr_regs = NULL;



/* ************************************************************************

arch/powerpc/platforms/83xx/mpc832x_rdb.c

+0 −5
Original line number Diff line number Diff line
@@ -32,11 +32,6 @@ 
#define DBG(fmt...)

#endif



#ifndef CONFIG_PCI

unsigned long isa_io_base = 0;

unsigned long isa_mem_base = 0;

#endif



/* ************************************************************************

 *

 * Setup the architecture

arch/powerpc/platforms/83xx/mpc834x_itx.c

+0 −5
Original line number Diff line number Diff line
@@ -38,11 +38,6 @@ 


#include "mpc83xx.h"



#ifndef CONFIG_PCI

unsigned long isa_io_base = 0;

unsigned long isa_mem_base = 0;

#endif



/* ************************************************************************

 *

 * Setup the architecture

arch/powerpc/platforms/83xx/mpc834x_mds.c

+0 −5
Original line number Diff line number Diff line
@@ -38,11 +38,6 @@ 


#include "mpc83xx.h"



#ifndef CONFIG_PCI

unsigned long isa_io_base = 0;

unsigned long isa_mem_base = 0;

#endif



#define BCSR5_INT_USB		0x02

/* Note: This is only for PB, not for PB+PIB

 * On PB only port0 is connected using ULPI */