diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-03 18:16:45 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-09 15:34:12 +0000 |
| commit | 80ea2065e186d8d69b617770ae7fe51dfea6ba90 (patch) | |
| tree | 9914b813d28db74d5843d8328d9db4d4aa05de08 /arch | |
| parent | f3bb3d7422b4161df31e2fd2e503897926d8ffe7 (diff) | |
| download | blackbird-op-linux-80ea2065e186d8d69b617770ae7fe51dfea6ba90.tar.gz blackbird-op-linux-80ea2065e186d8d69b617770ae7fe51dfea6ba90.zip | |
ARM: sa11x0: fix section mismatch warnings
Neponset calls sa1110_mb_disable() from __devinit code, but
sa1110_mb_disable() is marked __init, and so causes a section
mismatch warning.
As sa1110_mb_enable() and sa1110_mb_disable() need to be callable
from suspend/resume paths as well, they must not be marked __init
or __devinit.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/common/sa1111.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-sa1100/generic.c | 4 |
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 @@ #define IRQ_S0_BVD1_STSCHG (53) #define IRQ_S1_BVD1_STSCHG (54) -extern void __init sa1110_mb_enable(void); +extern void sa1110_mb_enable(void); /* * 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) * the MBGNT signal false to ensure the SA1111 doesn't own the * SDRAM bus. */ -void __init sa1110_mb_disable(void) +void sa1110_mb_disable(void) { unsigned long flags; @@ -447,7 +447,7 @@ void __init sa1110_mb_disable(void) * If the system is going to use the SA-1111 DMA engines, set up * the memory bus request/grant pins. */ -void __devinit sa1110_mb_enable(void) +void sa1110_mb_enable(void) { unsigned long flags; |
