Commit 416112f8 authored by David Brownell's avatar David Brownell Committed by Russell King

[ARM] 3741/1: remove sa1111.c build warning on non-sa1100 systems

Patch from David Brownell

Remove buld warning when building sa1111 on non-sa1100 platforms (e.g. PXA).
Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 8f1bf874
...@@ -618,7 +618,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) ...@@ -618,7 +618,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
{ {
struct sa1111 *sachip; struct sa1111 *sachip;
unsigned long id; unsigned long id;
unsigned int has_devs, val; unsigned int has_devs;
int i, ret = -ENODEV; int i, ret = -ENODEV;
sachip = kzalloc(sizeof(struct sa1111), GFP_KERNEL); sachip = kzalloc(sizeof(struct sa1111), GFP_KERNEL);
...@@ -669,6 +669,9 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) ...@@ -669,6 +669,9 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
sa1111_wake(sachip); sa1111_wake(sachip);
#ifdef CONFIG_ARCH_SA1100 #ifdef CONFIG_ARCH_SA1100
{
unsigned int val;
/* /*
* The SDRAM configuration of the SA1110 and the SA1111 must * The SDRAM configuration of the SA1110 and the SA1111 must
* match. This is very important to ensure that SA1111 accesses * match. This is very important to ensure that SA1111 accesses
...@@ -692,6 +695,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) ...@@ -692,6 +695,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq)
* Enable the SA1110 memory bus request and grant signals. * Enable the SA1110 memory bus request and grant signals.
*/ */
sa1110_mb_enable(); sa1110_mb_enable();
}
#endif #endif
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment