Skip to content

Commit

Permalink
[ARM] 3741/1: remove sa1111.c build warning on non-sa1100 systems
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
David Brownell authored and Russell King committed Aug 27, 2006
1 parent 8f1bf87 commit 416112f
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion arch/arm/common/sa1111.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand All @@ -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

/*
Expand Down

0 comments on commit 416112f

Please sign in to comment.