diff options
author | David Brownell <david-b@pacbell.net> | 2006-08-27 08:09:14 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-08-27 08:09:14 -0400 |
commit | 416112f818afcc08aeaba79ebba899aee5ddf571 (patch) | |
tree | 404f2d5f4c5969d3c46e35328f1fea65456cc7eb /arch/arm | |
parent | 8f1bf8743c459399685f5df43021acd156548c22 (diff) |
[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>
Diffstat (limited to 'arch/arm')
-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) | |||
618 | { | 618 | { |
619 | struct sa1111 *sachip; | 619 | struct sa1111 *sachip; |
620 | unsigned long id; | 620 | unsigned long id; |
621 | unsigned int has_devs, val; | 621 | unsigned int has_devs; |
622 | int i, ret = -ENODEV; | 622 | int i, ret = -ENODEV; |
623 | 623 | ||
624 | sachip = kzalloc(sizeof(struct sa1111), GFP_KERNEL); | 624 | sachip = kzalloc(sizeof(struct sa1111), GFP_KERNEL); |
@@ -669,6 +669,9 @@ __sa1111_probe(struct device *me, struct resource *mem, int irq) | |||
669 | sa1111_wake(sachip); | 669 | sa1111_wake(sachip); |
670 | 670 | ||
671 | #ifdef CONFIG_ARCH_SA1100 | 671 | #ifdef CONFIG_ARCH_SA1100 |
672 | { | ||
673 | unsigned int val; | ||
674 | |||
672 | /* | 675 | /* |
673 | * The SDRAM configuration of the SA1110 and the SA1111 must | 676 | * The SDRAM configuration of the SA1110 and the SA1111 must |
674 | * match. This is very important to ensure that SA1111 accesses | 677 | * 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 | * Enable the SA1110 memory bus request and grant signals. | 695 | * Enable the SA1110 memory bus request and grant signals. |
693 | */ | 696 | */ |
694 | sa1110_mb_enable(); | 697 | sa1110_mb_enable(); |
698 | } | ||
695 | #endif | 699 | #endif |
696 | 700 | ||
697 | /* | 701 | /* |