diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-14 19:08:53 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-14 19:08:53 +0100 |
| commit | b214b7bbffca8ac6a6f1dad46408f7a9d4219098 (patch) | |
| tree | 2ef03e062e2a04ea9f2d5439b0daea5274a1bc98 /arch/sh/kernel/cpu/sh4/setup-sh7750.c | |
| parent | spi/spidev: Add 32 bit compat ioctl() (diff) | |
| parent | Linux 2.6.38-rc4 (diff) | |
| download | linux-b214b7bbffca8ac6a6f1dad46408f7a9d4219098.tar.xz linux-b214b7bbffca8ac6a6f1dad46408f7a9d4219098.zip | |
Merge commit 'v2.6.38-rc4' into spi/next
Diffstat (limited to 'arch/sh/kernel/cpu/sh4/setup-sh7750.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4/setup-sh7750.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c index c2b0aaaedcae..672944f5b19c 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c @@ -230,10 +230,10 @@ static struct platform_device *sh7750_devices[] __initdata = { static int __init sh7750_devices_setup(void) { if (mach_is_rts7751r2d()) { - platform_register_device(&scif_device); + platform_device_register(&scif_device); } else { - platform_register_device(&sci_device); - platform_register_device(&scif_device); + platform_device_register(&sci_device); + platform_device_register(&scif_device); } return platform_add_devices(sh7750_devices, |