aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/arm/common/sa1111.c2
-rw-r--r--arch/arm/mach-sa1100/generic.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c
index 61691cdbdcf2..bf508a78aa33 100644
--- a/arch/arm/common/sa1111.c
+++ b/arch/arm/common/sa1111.c
@@ -87,7 +87,7 @@
87#define IRQ_S0_BVD1_STSCHG (53) 87#define IRQ_S0_BVD1_STSCHG (53)
88#define IRQ_S1_BVD1_STSCHG (54) 88#define IRQ_S1_BVD1_STSCHG (54)
89 89
90extern void __init sa1110_mb_enable(void); 90extern void sa1110_mb_enable(void);
91 91
92/* 92/*
93 * We keep the following data for the overall SA1111. Note that the 93 * We keep the following data for the overall SA1111. Note that the
diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c
index bb10ee2cb89f..0e356bb89fb7 100644
--- a/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@ -428,7 +428,7 @@ void __init sa1100_map_io(void)
428 * the MBGNT signal false to ensure the SA1111 doesn't own the 428 * the MBGNT signal false to ensure the SA1111 doesn't own the
429 * SDRAM bus. 429 * SDRAM bus.
430 */ 430 */
431void __init sa1110_mb_disable(void) 431void sa1110_mb_disable(void)
432{ 432{
433 unsigned long flags; 433 unsigned long flags;
434 434
@@ -447,7 +447,7 @@ void __init sa1110_mb_disable(void)
447 * If the system is going to use the SA-1111 DMA engines, set up 447 * If the system is going to use the SA-1111 DMA engines, set up
448 * the memory bus request/grant pins. 448 * the memory bus request/grant pins.
449 */ 449 */
450void __devinit sa1110_mb_enable(void) 450void sa1110_mb_enable(void)
451{ 451{
452 unsigned long flags; 452 unsigned long flags;
453 453