diff options
| author | Nobuhiro Iwamatsu <iwamatsu@nigauri.org> | 2011-01-28 22:04:01 +0000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-02-01 19:33:55 +0900 |
| commit | 0ce08870b8a4895044b6cf2bbdc774a6faaa3656 (patch) | |
| tree | 067b2d395c5f6060335795b9e5e24cb936e0ecf8 | |
| parent | 5939d25ff296bd69fd98ead938cb63e467939040 (diff) | |
| download | talos-obmc-linux-0ce08870b8a4895044b6cf2bbdc774a6faaa3656.tar.gz talos-obmc-linux-0ce08870b8a4895044b6cf2bbdc774a6faaa3656.zip | |
sh: sh7750: Fix incompatible pointer type
It is necessary to set array of struct platform_device in
early_platform_add_devices().
arch/sh/kernel/cpu/sh4/setup-sh7750.c: In function ‘plat_early_device_setup’:
arch/sh/kernel/cpu/sh4/setup-sh7750.c:260: warning: passing argument 1 of ‘early_platform_add_devices’ from incompatible pointer type
include/linux/platform_device.h:159: note: expected ‘struct platform_device **’ but argument is of type ‘struct platform_device *’
arch/sh/kernel/cpu/sh4/setup-sh7750.c:262: warning: passing argument 1 of ‘early_platform_add_devices’ from incompatible pointer type
include/linux/platform_device.h:159: note: expected ‘struct platform_device **’ but argument is of type ‘struct platform_device *’
arch/sh/kernel/cpu/sh4/setup-sh7750.c:263: warning: passing argument 1 of ‘early_platform_add_devices’ from incompatible pointer type
include/linux/platform_device.h:159: note: expected ‘struct platform_device **’ but argument is of type ‘struct platform_device *’
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
| -rw-r--r-- | arch/sh/kernel/cpu/sh4/setup-sh7750.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c index 84230e9ed962..e53b4b38bd11 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c @@ -255,12 +255,17 @@ static struct platform_device *sh7750_early_devices[] __initdata = { void __init plat_early_device_setup(void) { + struct platform_device *dev[1]; + if (mach_is_rts7751r2d()) { scif_platform_data.scscr |= SCSCR_CKE1; - early_platform_add_devices(&scif_device, 1); + dev[0] = &scif_device; + early_platform_add_devices(dev, 1); } else { - early_platform_add_devices(&sci_device, 1); - early_platform_add_devices(&scif_device, 1); + dev[0] = &sci_device; + early_platform_add_devices(dev, 1); + dev[0] = &scif_device; + early_platform_add_devices(dev, 1); } early_platform_add_devices(sh7750_early_devices, |
