[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>
This commit is contained in:
Родитель
8f1bf8743c
Коммит
416112f818
|
@ -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)
|
||||||
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)
|
||||||
* 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
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Загрузка…
Ссылка в новой задаче