git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-iop13xx
/
include
/
mach
/
hardware.h
diff --git
a/arch/arm/mach-iop13xx/include/mach/hardware.h
b/arch/arm/mach-iop13xx/include/mach/hardware.h
index
8e1d562
..
786fa26
100644
(file)
--- a/
arch/arm/mach-iop13xx/include/mach/hardware.h
+++ b/
arch/arm/mach-iop13xx/include/mach/hardware.h
@@
-2,18
+2,11
@@
#define __ASM_ARCH_HARDWARE_H
#include <asm/types.h>
#define __ASM_ARCH_HARDWARE_H
#include <asm/types.h>
-#define pcibios_assign_all_busses() 1
-
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLY__
-extern unsigned long iop13xx_pcibios_min_io;
-extern unsigned long iop13xx_pcibios_min_mem;
extern u16 iop13xx_dev_id(void);
extern void iop13xx_set_atu_mmr_bases(void);
#endif
extern u16 iop13xx_dev_id(void);
extern void iop13xx_set_atu_mmr_bases(void);
#endif
-#define PCIBIOS_MIN_IO (iop13xx_pcibios_min_io)
-#define PCIBIOS_MIN_MEM (iop13xx_pcibios_min_mem)
-
/*
* Generic chipset bits
*
/*
* Generic chipset bits
*