diff options
| author | David Brownell <david-b@pacbell.net> | 2006-08-27 13:09:14 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-08-27 13:09:14 +0100 |
| commit | 416112f818afcc08aeaba79ebba899aee5ddf571 (patch) | |
| tree | 404f2d5f4c5969d3c46e35328f1fea65456cc7eb | |
| parent | 8f1bf8743c459399685f5df43021acd156548c22 (diff) | |
| download | talos-op-linux-416112f818afcc08aeaba79ebba899aee5ddf571.tar.gz talos-op-linux-416112f818afcc08aeaba79ebba899aee5ddf571.zip | |
[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: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/common/sa1111.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/common/sa1111.c b/arch/arm/common/sa1111.c index a331c12cead9..29818bd3248f 100644 --- a/arch/arm/common/sa1111.c +++ b/arch/arm/common/sa1111.c @@ -618,7 +618,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) { struct sa1111 *sachip; unsigned long id; - unsigned int has_devs, val; + unsigned int has_devs; int i, ret = -ENODEV; sachip = kzalloc(sizeof(struct sa1111), GFP_KERNEL); @@ -669,6 +669,9 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) sa1111_wake(sachip); #ifdef CONFIG_ARCH_SA1100 + { + unsigned int val; + /* * The SDRAM configuration of the SA1110 and the SA1111 must * match. This is very important to ensure that SA1111 accesses @@ -692,6 +695,7 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) * Enable the SA1110 memory bus request and grant signals. */ sa1110_mb_enable(); + } #endif /* |
