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 branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
arch
/
arm
/
mach-sa1100
/
include
/
mach
/
hardware.h
diff --git
a/arch/arm/mach-sa1100/include/mach/hardware.h
b/arch/arm/mach-sa1100/include/mach/hardware.h
index
6071182
..
967ae76
100644
(file)
--- a/
arch/arm/mach-sa1100/include/mach/hardware.h
+++ b/
arch/arm/mach-sa1100/include/mach/hardware.h
@@
-1,7
+1,7
@@
/*
* arch/arm/mach-sa1100/include/mach/hardware.h
*
/*
* arch/arm/mach-sa1100/include/mach/hardware.h
*
- * Copyright (C) 1998 Nicolas Pitre <nico@
cam.org
>
+ * Copyright (C) 1998 Nicolas Pitre <nico@
fluxnic.net
>
*
* This file contains the hardware definitions for SA1100 architecture
*
*
* This file contains the hardware definitions for SA1100 architecture
*
@@
-76,4
+76,12
@@
static inline unsigned long get_clock_tick_rate(void)
#include "SA-1101.h"
#endif
#include "SA-1101.h"
#endif
+#if defined(CONFIG_ARCH_SA1100) && defined(CONFIG_PCI)
+#define PCIBIOS_MIN_IO 0
+#define PCIBIOS_MIN_MEM 0
+#define pcibios_assign_all_busses() 1
+#define HAVE_ARCH_PCI_SET_DMA_MASK 1
+#endif
+
+
#endif /* _ASM_ARCH_HARDWARE_H */
#endif /* _ASM_ARCH_HARDWARE_H */