diff options
| -rw-r--r-- | arch/arm/mach-sa1100/assabet.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/badge4.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/include/mach/memory.h | 4 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/jornada720.c | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c index 5778274a8260..26257df19b63 100644 --- a/arch/arm/mach-sa1100/assabet.c +++ b/arch/arm/mach-sa1100/assabet.c | |||
| @@ -453,4 +453,7 @@ MACHINE_START(ASSABET, "Intel-Assabet") | |||
| 453 | .init_irq = sa1100_init_irq, | 453 | .init_irq = sa1100_init_irq, |
| 454 | .timer = &sa1100_timer, | 454 | .timer = &sa1100_timer, |
| 455 | .init_machine = assabet_init, | 455 | .init_machine = assabet_init, |
| 456 | #ifdef CONFIG_SA1111 | ||
| 457 | .dma_zone_size = SZ_1M, | ||
| 458 | #endif | ||
| 456 | MACHINE_END | 459 | MACHINE_END |
diff --git a/arch/arm/mach-sa1100/badge4.c b/arch/arm/mach-sa1100/badge4.c index 4f19ff868b00..b4311b0a4395 100644 --- a/arch/arm/mach-sa1100/badge4.c +++ b/arch/arm/mach-sa1100/badge4.c | |||
| @@ -306,4 +306,7 @@ MACHINE_START(BADGE4, "Hewlett-Packard Laboratories BadgePAD 4") | |||
| 306 | .map_io = badge4_map_io, | 306 | .map_io = badge4_map_io, |
| 307 | .init_irq = sa1100_init_irq, | 307 | .init_irq = sa1100_init_irq, |
| 308 | .timer = &sa1100_timer, | 308 | .timer = &sa1100_timer, |
| 309 | #ifdef CONFIG_SA1111 | ||
| 310 | .dma_zone_size = SZ_1M, | ||
| 311 | #endif | ||
| 309 | MACHINE_END | 312 | MACHINE_END |
diff --git a/arch/arm/mach-sa1100/include/mach/memory.h b/arch/arm/mach-sa1100/include/mach/memory.h index cff31ee246b7..12d376795abc 100644 --- a/arch/arm/mach-sa1100/include/mach/memory.h +++ b/arch/arm/mach-sa1100/include/mach/memory.h | |||
| @@ -14,10 +14,6 @@ | |||
| 14 | */ | 14 | */ |
| 15 | #define PLAT_PHYS_OFFSET UL(0xc0000000) | 15 | #define PLAT_PHYS_OFFSET UL(0xc0000000) |
| 16 | 16 | ||
| 17 | #ifdef CONFIG_SA1111 | ||
| 18 | #define ARM_DMA_ZONE_SIZE SZ_1M | ||
| 19 | #endif | ||
| 20 | |||
| 21 | /* | 17 | /* |
| 22 | * Because of the wide memory address space between physical RAM banks on the | 18 | * Because of the wide memory address space between physical RAM banks on the |
| 23 | * SA1100, it's much convenient to use Linux's SparseMEM support to implement | 19 | * SA1100, it's much convenient to use Linux's SparseMEM support to implement |
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c index 491ac9f20fb4..176c066aec7e 100644 --- a/arch/arm/mach-sa1100/jornada720.c +++ b/arch/arm/mach-sa1100/jornada720.c | |||
| @@ -369,4 +369,7 @@ MACHINE_START(JORNADA720, "HP Jornada 720") | |||
| 369 | .init_irq = sa1100_init_irq, | 369 | .init_irq = sa1100_init_irq, |
| 370 | .timer = &sa1100_timer, | 370 | .timer = &sa1100_timer, |
| 371 | .init_machine = jornada720_mach_init, | 371 | .init_machine = jornada720_mach_init, |
| 372 | #ifdef CONFIG_SA1111 | ||
| 373 | .dma_zone_size = SZ_1M, | ||
| 374 | #endif | ||
| 372 | MACHINE_END | 375 | MACHINE_END |
