diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-22 15:58:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-16 05:57:36 -0400 |
| commit | b65b4781fbd5846a82cdac0c32818af1a7452d1f (patch) | |
| tree | 532f95a901c0d7dcd1d628e68d7984f09750bb4d /arch/arm/mach-ixp4xx/include/mach | |
| parent | be370302742ff9948f2a42b15cb2ba174d97b930 (diff) | |
ARM: Remove 'node' argument form arch_adjust_zones()
Since we no longer support discontigmem, node is always zero, so
remove this argument.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ixp4xx/include/mach')
| -rw-r--r-- | arch/arm/mach-ixp4xx/include/mach/memory.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-ixp4xx/include/mach/memory.h b/arch/arm/mach-ixp4xx/include/mach/memory.h index 98f5e5e20980..0136eaa29224 100644 --- a/arch/arm/mach-ixp4xx/include/mach/memory.h +++ b/arch/arm/mach-ixp4xx/include/mach/memory.h | |||
| @@ -16,10 +16,10 @@ | |||
| 16 | 16 | ||
| 17 | #if !defined(__ASSEMBLY__) && defined(CONFIG_PCI) | 17 | #if !defined(__ASSEMBLY__) && defined(CONFIG_PCI) |
| 18 | 18 | ||
| 19 | void ixp4xx_adjust_zones(int node, unsigned long *size, unsigned long *holes); | 19 | void ixp4xx_adjust_zones(unsigned long *size, unsigned long *holes); |
| 20 | 20 | ||
| 21 | #define arch_adjust_zones(node, size, holes) \ | 21 | #define arch_adjust_zones(size, holes) \ |
| 22 | ixp4xx_adjust_zones(node, size, holes) | 22 | ixp4xx_adjust_zones(size, holes) |
| 23 | 23 | ||
| 24 | #define ISA_DMA_THRESHOLD (SZ_64M - 1) | 24 | #define ISA_DMA_THRESHOLD (SZ_64M - 1) |
| 25 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) | 25 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_64M) |