diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:41:23 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-08-08 03:41:23 -0400 |
| commit | 4791d63bd40ec63c533060707dae0232b9969dc0 (patch) | |
| tree | 8e10fe91cea556c10f7d211b65c5f6bdd7ffeb55 /arch/arm/mach-iop32x/include/mach/hardware.h | |
| parent | b3623080ff6974e696710b6c6eb4cdbf2bbab347 (diff) | |
| parent | 322a8b034003c0d46d39af85bf24fee27b902f48 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into rmobile-latest
Diffstat (limited to 'arch/arm/mach-iop32x/include/mach/hardware.h')
| -rw-r--r-- | arch/arm/mach-iop32x/include/mach/hardware.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-iop32x/include/mach/hardware.h b/arch/arm/mach-iop32x/include/mach/hardware.h index d559c4e6095a..48cb1b20ba91 100644 --- a/arch/arm/mach-iop32x/include/mach/hardware.h +++ b/arch/arm/mach-iop32x/include/mach/hardware.h | |||
| @@ -18,9 +18,6 @@ | |||
| 18 | * but when we read them, we convert them to virtual addresses. See | 18 | * but when we read them, we convert them to virtual addresses. See |
| 19 | * arch/arm/plat-iop/pci.c. | 19 | * arch/arm/plat-iop/pci.c. |
| 20 | */ | 20 | */ |
| 21 | #define pcibios_assign_all_busses() 1 | ||
| 22 | #define PCIBIOS_MIN_IO 0x00000000 | ||
| 23 | #define PCIBIOS_MIN_MEM 0x00000000 | ||
| 24 | 21 | ||
| 25 | #ifndef __ASSEMBLY__ | 22 | #ifndef __ASSEMBLY__ |
| 26 | void iop32x_init_irq(void); | 23 | void iop32x_init_irq(void); |