diff options
Diffstat (limited to 'arch/arm/mach-sa1100')
-rw-r--r-- | arch/arm/mach-sa1100/generic.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-sa1100/include/mach/memory.h | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-sa1100/generic.h b/arch/arm/mach-sa1100/generic.h index ec03f187c52b..b7a9a601c2d1 100644 --- a/arch/arm/mach-sa1100/generic.h +++ b/arch/arm/mach-sa1100/generic.h | |||
@@ -13,8 +13,7 @@ extern void __init sa1100_init_gpio(void); | |||
13 | 13 | ||
14 | #define SET_BANK(__nr,__start,__size) \ | 14 | #define SET_BANK(__nr,__start,__size) \ |
15 | mi->bank[__nr].start = (__start), \ | 15 | mi->bank[__nr].start = (__start), \ |
16 | mi->bank[__nr].size = (__size), \ | 16 | mi->bank[__nr].size = (__size) |
17 | mi->bank[__nr].node = (((unsigned)(__start) - PHYS_OFFSET) >> 27) | ||
18 | 17 | ||
19 | extern void (*sa1100fb_backlight_power)(int on); | 18 | extern void (*sa1100fb_backlight_power)(int on); |
20 | extern void (*sa1100fb_lcd_power)(int on); | 19 | extern void (*sa1100fb_lcd_power)(int on); |
diff --git a/arch/arm/mach-sa1100/include/mach/memory.h b/arch/arm/mach-sa1100/include/mach/memory.h index d5277f9bee77..128a1dfa96b9 100644 --- a/arch/arm/mach-sa1100/include/mach/memory.h +++ b/arch/arm/mach-sa1100/include/mach/memory.h | |||
@@ -17,10 +17,10 @@ | |||
17 | #ifndef __ASSEMBLY__ | 17 | #ifndef __ASSEMBLY__ |
18 | 18 | ||
19 | #ifdef CONFIG_SA1111 | 19 | #ifdef CONFIG_SA1111 |
20 | void sa1111_adjust_zones(int node, unsigned long *size, unsigned long *holes); | 20 | void sa1111_adjust_zones(unsigned long *size, unsigned long *holes); |
21 | 21 | ||
22 | #define arch_adjust_zones(node, size, holes) \ | 22 | #define arch_adjust_zones(size, holes) \ |
23 | sa1111_adjust_zones(node, size, holes) | 23 | sa1111_adjust_zones(size, holes) |
24 | 24 | ||
25 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_1M - 1) | 25 | #define ISA_DMA_THRESHOLD (PHYS_OFFSET + SZ_1M - 1) |
26 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_1M) | 26 | #define MAX_DMA_ADDRESS (PAGE_OFFSET + SZ_1M) |